From 55edc3a64065ad516f2bdd76f0438993cc4972f7 Mon Sep 17 00:00:00 2001
From: chentao <chentao@easycorp.ltd>
Date: Sat, 8 Jul 2023 17:11:47 +0800
Subject: [PATCH] * Integrate level 1.5 menu into all UI templates that are
 relevant to the program module.

---
 module/personnel/ui/accessible.html.php |  2 ++
 module/personnel/ui/invest.html.php     |  2 ++
 module/personnel/ui/whitelist.html.php  |  2 ++
 module/product/ui/browse.html.php       |  2 +-
 module/program/ui/product.html.php      | 12 ++++++++++++
 module/program/ui/project.html.php      |  2 ++
 module/program/ui/stakeholder.html.php  |  4 +++-
 module/stakeholder/ui/browse.html.php   |  2 +-
 module/stakeholder/ui/create.html.php   |  2 ++
 9 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/module/personnel/ui/accessible.html.php b/module/personnel/ui/accessible.html.php
index 0bef8e29c4..6e340fef61 100644
--- a/module/personnel/ui/accessible.html.php
+++ b/module/personnel/ui/accessible.html.php
@@ -15,6 +15,8 @@ $config->personnel->accessible->dtable->fieldList['dept']['map'] = $deptList;
 $cols = array_values($config->personnel->accessible->dtable->fieldList);
 $data = array_values($personnelList);
 
+dropmenu();
+
 featureBar
 (
     li(searchToggle())
diff --git a/module/personnel/ui/invest.html.php b/module/personnel/ui/invest.html.php
index 22782f5695..5b57fe0083 100644
--- a/module/personnel/ui/invest.html.php
+++ b/module/personnel/ui/invest.html.php
@@ -9,6 +9,8 @@ declare(strict_types=1);
  * @link        https://www.zentao.net
  */
 namespace zin;
+
+dropmenu();
 ?>
 <div class='main-table bg-white'>
   <?php if(!empty($investList)):?>
diff --git a/module/personnel/ui/whitelist.html.php b/module/personnel/ui/whitelist.html.php
index 49ea0045fb..71c13aa721 100644
--- a/module/personnel/ui/whitelist.html.php
+++ b/module/personnel/ui/whitelist.html.php
@@ -19,6 +19,8 @@ $whitelist = initTableData($whitelist, $config->personnel->whitelist->dtable->fi
 $cols = array_values($config->personnel->whitelist->dtable->fieldList);
 $data = array_values($whitelist);
 
+dropmenu();
+
 featureBar
 (
     set::current('all'),
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index ea360657d4..14d93777b5 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -26,7 +26,7 @@ $storyProductID = count($storyProductIds) > 1 ? 0 : $productID;
 dropmenu();
 
 /* Generate sidebar to display module tree menu. */
-$fnGenerateSideBar = function() use ($moduleTree, $moduleID, $productID, $branchID, $branchType)
+$fnGenerateSideBar = function() use ($moduleTree, $moduleID, $productID, $branchID)
 {
     sidebar
     (
diff --git a/module/program/ui/product.html.php b/module/program/ui/product.html.php
index 304dd09736..c36552f16d 100644
--- a/module/program/ui/product.html.php
+++ b/module/program/ui/product.html.php
@@ -1,6 +1,18 @@
 <?php
+declare(strict_types=1);
+/**
+ * The product view file of program module of ZenTaoPMS.
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      wangyidong<wangyidong@cnezsoft.com>
+ * @package     program
+ * @link        https://www.zentao.net
+ */
+
 namespace zin;
 
+dropmenu();
+
 featureBar
 (
     set::current($browseType),
diff --git a/module/program/ui/project.html.php b/module/program/ui/project.html.php
index b51940f06e..4492cabe32 100644
--- a/module/program/ui/project.html.php
+++ b/module/program/ui/project.html.php
@@ -3,6 +3,8 @@ namespace zin;
 
 jsVar('confirmDeleteTip', $lang->project->confirmDelete);
 
+dropmenu();
+
 featureBar
 (
     set::current($browseType),
diff --git a/module/program/ui/stakeholder.html.php b/module/program/ui/stakeholder.html.php
index a26973f746..044e420aa4 100644
--- a/module/program/ui/stakeholder.html.php
+++ b/module/program/ui/stakeholder.html.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * The stakeholder view file of program module of ZenTaoPMS.
  * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
@@ -8,9 +9,10 @@
  * @link        https://www.zentao.net
  */
 
-declare(strict_types=1);
 namespace zin;
 
+dropmenu();
+
 /* Feature bar. */
 $navLinkParams = array('program' => $programID);
 featureBar
diff --git a/module/stakeholder/ui/browse.html.php b/module/stakeholder/ui/browse.html.php
index b21f8e7641..c7c43e4dc9 100644
--- a/module/stakeholder/ui/browse.html.php
+++ b/module/stakeholder/ui/browse.html.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * The browse view file of stakeholder module of ZenTaoPMS.
  * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
@@ -8,7 +9,6 @@
  * @link        https://www.zentao.net
  */
 
-declare(strict_types=1);
 namespace zin;
 
 /* Level 3 navigator. */
diff --git a/module/stakeholder/ui/create.html.php b/module/stakeholder/ui/create.html.php
index 7e3534d1f3..3fcff0cedb 100644
--- a/module/stakeholder/ui/create.html.php
+++ b/module/stakeholder/ui/create.html.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace zin;
 
+dropmenu();
+
 formPanel
 (
     set::url(createLink('stakeholder', 'create', "objectID=$objectID")),