* Code for finish task #83722.

module/admin/lang/menu.php

@@ -96,9 +96,9 @@ $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$l
 if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
 
 $lang->admin->menuList->feature['tabMenu']['product']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept');
-$lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->productCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"));
-$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productCommon}|custom|required|module=productplan");
-$lang->admin->menuList->feature['tabMenu']['product']['release']     = array('link' => "{$lang->productCommon}|custom|required|module=release");
+$lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"));
+$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan");
+$lang->admin->menuList->feature['tabMenu']['product']['release']     = array('link' => "{$lang->release->common}|custom|required|module=release");
 
 $lang->admin->menuList->feature['menuOrder']['5']  = 'my';
 $lang->admin->menuList->feature['menuOrder']['10'] = 'product';

module/admin/model.php

@@ -274,15 +274,22 @@ class adminModel extends model
                 $moduleName = $this->app->rawModule;
                 $methodName = $this->app->rawMethod;
                 $paramName  = $this->app->rawParams ? reset($this->app->rawParams) : '';
-                if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
+                foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu)
                 {
-                    if(strpos(',todo,block,', $paramName) !== false) $subMenuKey = 'my';
-                    if(strpos(',product,story,productplan,release,', $paramName) !== false) $subMenuKey = 'product';
-                    if($this->config->vision == 'lite' and $paramName == 'task') $subMenuKey = 'my';
-                    if(isset($subMenuKey)) $this->lang->admin->menuList->$menuKey['subMenu'][$subMenuKey]['subModule'] = $moduleName;
+                    $subModule = '';
+                    if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
+                    {
+                        if(strpos(',todo,block,', $paramName) !== false and $subMenuKey == 'my') $subModule = 'custom';
+                        if(strpos(',product,story,productplan,release,', $paramName) !== false and $subMenuKey == 'product') $subModule = 'custom';
+                        if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
+                    }
+
+                    if(!empty($subModule)) $subMenu['subModule'] = $subModule;
+                    if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey])) $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey];
+
+                    $this->lang->admin->menu->$subMenuKey = $subMenu;
                 }
 
-                $this->lang->admin->menu = $this->lang->admin->menuList->$menuKey['subMenu'];
             }
 
             if(isset($this->lang->admin->menuList->$menuKey['menuOrder']))   $this->lang->admin->menuOrder   = $this->lang->admin->menuList->$menuKey['menuOrder'];
@@ -317,8 +324,16 @@ class adminModel extends model
                         /* Check tab menu priv. */
                         foreach($menu['tabMenu'][$subMenuKey] as $tabMenuKey => $tabMenu)
                         {
-                            $link = $this->getHasPrivLink($tabMenu);
-                            if(!empty($link)) break;
+                            $tabMenuLink = $this->getHasPrivLink($tabMenu);
+                            if(!empty($tabMenuLink))
+                            {
+                                /* Updated tertiary navigation links. */
+                                list($module, $method, $params) = $tabMenuLink;
+                                $tabMenuLabel = $tabMenu['link'];
+                                $menu['tabMenu'][$subMenuKey][$tabMenuKey]['link'] = substr($tabMenuLabel, 0, strpos($tabMenuLabel, '|') + 1) . $module . '|' . $method . '|' . $params;
+
+                                if(empty($link)) $link = $tabMenuLink;
+                            }
                         }
                     }
                     else
@@ -330,7 +345,7 @@ class adminModel extends model
                     {
                         /* Updated secondary navigation link. */
                         list($module, $method, $params) = $link;
-                        $subMenuLabel = $menu['subMenu'][$subMenuKey]['link'];
+                        $subMenuLabel = $subMenu['link'];
                         $menu['subMenu'][$subMenuKey]['link'] = substr($subMenuLabel, 0, strpos($subMenuLabel, '|') + 1) . $module . '|' . $method . '|' . $params;
 
                         /* Update the level 1 navigation link. */

module/admin/view/tabmenu.html.php

@@ -1,30 +0,0 @@
-<div id="mainMenu" class="clearfix menu-secondary">
-  <div class="btn-toolbar pull-left">
-  <?php
-  $tabMenuList = isset($lang->admin->tabMenu[$activeMenu]) ? $lang->admin->tabMenu[$activeMenu] : array();
-  foreach($tabMenuList as $tabMenuKey => $tabMenu)
-  {
-      $link = $this->admin->getHasPrivLink($tabMenu);
-      if(empty($link)) continue;
-
-      list($tabModule, $tabMethod, $tabParams) = $link;
-
-      $name          = $lang->custom->object[$tabMenuKey];
-      $paramName     = $this->app->rawParams ? reset($this->app->rawParams) : '';
-      $currentMethod = $app->rawMethod;
-      $active        = '';
-      if(strpos(',required,set,', ",$currentMethod,",) === false)
-      {
-          if($currentMethod == $tabMenuKey) $active = 'btn-active-text';
-          if(isset($tabMenu['alias']) and strpos(",{$tabMenu['alias']},", ",$currentMethod",) !== false) $active = 'btn-active-text';
-      }
-      elseif($paramName == $tabMenuKey)
-      {
-          $active = 'btn-active-text';
-      }
-
-      common::printLink($tabModule, $tabMethod, $tabParams, "<span class='text'>{$name}</span>", '', "class='btn btn-link {$active}' id='{$tabMenuKey}Tab'");
-  }
-  ?>
-  </div>
-</div>

module/custom/view/browsestoryconcept.html.php

@@ -9,7 +9,7 @@
  * @version     $Id: browsestoryconcept.html.php 4129 2020-09-01 01:58:14Z sgm $
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
   <?php include 'sidebar.html.php';?>
   <div class='main-col main-content main-table'>

module/custom/view/execution.html.php

@@ -9,7 +9,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <form class="load-indicator main-form form-ajax" method='post'>
     <table class='table table-form'>

module/custom/view/flow.html.php

@@ -9,7 +9,7 @@
  * @version     $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <?php if(isset($this->config->conceptSetted)):?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>

module/custom/view/header.html.php

@@ -1,2 +0,0 @@
-<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<?php include $app->getModuleRoot() . 'admin/view/tabmenu.html.php';?>

module/custom/view/kanban.html.php

@@ -9,7 +9,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <form class="load-indicator main-form form-ajax" method='post'>
     <table class='table table-form'>

module/custom/view/product.html.php

@@ -9,7 +9,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
   <?php include 'sidebar.html.php';?>
   <div class='main-col main-content'>

module/custom/view/required.html.php

@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
   <?php if(!in_array($module, array('productplan', 'release'))) include 'sidebar.html.php';?>
   <div class='main-col main-content'>

module/custom/view/score.html.php

@@ -9,7 +9,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <form class="load-indicator main-form form-ajax" method='post'>
     <div class='main-header'>

module/custom/view/set.html.php

@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <?php
 $itemRow = <<<EOT
   <tr class='text-center'>

module/custom/view/working.html.php

@@ -1,35 +0,0 @@
-<?php
-/**
- * The set view file of custom module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
- * @author      Tingting Dai <daitingting@xirangit.com>
- * @package     custom
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php include 'header.html.php';?>
-<div id='mainContent' class='main-content'>
-  <form class="load-indicator main-form form-ajax" method='post'>
-    <div class='main-header'>
-      <div class='heading'>
-        <strong><?php echo $lang->custom->working?></strong>
-      </div>
-    </div>
-    <table class='table table-form'>
-      <tr>
-        <th class='text-top'><?php echo $lang->custom->working;?></th>
-        <td>
-          <?php $checkedKey = isset($config->global->flow) ? $config->global->flow : 'full';?>
-          <?php foreach($lang->custom->workingList as $key => $value):?>
-          <p><label class="radio-inline"><input type="radio" name="flow" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="flow<?php echo $key;?>"><?php echo $value;?></label></p>
-          <?php endforeach;?>
-        </td>
-      </tr>
-      <tr><td></td><td><?php echo html::submitButton()?></td></tr>
-    </table>
-  </form>
-</div>
-<?php include '../../common/view/footer.html.php';?>

module/release/lang/de.php

@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = 'Product Release';
 $lang->release->create           = "Erstellen";
 $lang->release->edit             = "Bearbeiten";
 $lang->release->linkStory        = "Story verknüpfen";

module/release/lang/en.php

@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = 'Product Release';
 $lang->release->create           = "Create Release";
 $lang->release->edit             = "Edit Release";
 $lang->release->linkStory        = "Link Story";

module/release/lang/fr.php

@@ -9,7 +9,6 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = 'Product Release';
 $lang->release->create           = "Créer Release";
 $lang->release->edit             = "Editer Release";
 $lang->release->linkStory        = "Intégrer Story";

module/release/lang/zh-cn.php

@@ -9,7 +9,6 @@
  * @version     $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common           = '产品发布';
 $lang->release->create           = "创建发布";
 $lang->release->edit             = "编辑发布";
 $lang->release->linkStory        = "关联{$lang->SRCommon}";