From fba5fa131e744bd2efa8c5838bd5ffeb7f1f62f3 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 21 Jan 2021 13:27:59 +0800
Subject: [PATCH] * Finish task #8955.

---
 module/common/lang/de.php          |  7 +++++++
 module/common/lang/en.php          |  7 +++++++
 module/common/lang/fr.php          |  7 +++++++
 module/common/lang/vi.php          |  7 +++++++
 module/common/lang/zh-cn.php       |  7 +++++++
 module/design/control.php          | 13 +++++++++++++
 module/design/js/browse.js         |  5 +++++
 module/design/view/browse.html.php | 19 +------------------
 8 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 module/design/js/browse.js

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index d230197c0a..bea68fb156 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -1017,6 +1017,13 @@ $lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|prog
 $lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
 $lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
+$lang->design->menu->all      = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
+$lang->design->menu->hlds     = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
+$lang->design->menu->dds      = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
+$lang->design->menu->dbds     = array('link' => 'DBDS|design|browse|productID={PRODUCT}&browseType=DBDS');
+$lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PRODUCT}&browseType=ADS');
+$lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
+
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 30548b5b9b..aa02b48667 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -1015,6 +1015,13 @@ $lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|prog
 $lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
 $lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
+$lang->design->menu->all      = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
+$lang->design->menu->hlds     = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
+$lang->design->menu->dds      = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
+$lang->design->menu->dbds     = array('link' => 'DBDS|design|browse|productID={PRODUCT}&browseType=DBDS');
+$lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PRODUCT}&browseType=ADS');
+$lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
+
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 310f6f452d..b83f9d5c88 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -1017,6 +1017,13 @@ $lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|prog
 $lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
 $lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
+$lang->design->menu->all      = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
+$lang->design->menu->hlds     = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
+$lang->design->menu->dds      = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
+$lang->design->menu->dbds     = array('link' => 'DBDS|design|browse|productID={PRODUCT}&browseType=DBDS');
+$lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PRODUCT}&browseType=ADS');
+$lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
+
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index eaa1c36746..471cdd6a15 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -1017,6 +1017,13 @@ $lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|prog
 $lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
 $lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
 
+$lang->design->menu->all      = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
+$lang->design->menu->hlds     = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
+$lang->design->menu->dds      = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
+$lang->design->menu->dbds     = array('link' => 'DBDS|design|browse|productID={PRODUCT}&browseType=DBDS');
+$lang->design->menu->ads      = array('link' => 'ADS|design|browse|productID={PRODUCT}&browseType=ADS');
+$lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
+
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 02931a762a..65110c51e6 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -1017,6 +1017,13 @@ $lang->programplan->menu->lists = array('link' => '阶段列表|programplan|brow
 $lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
 $lang->projectstory->menu->track = array('link' => '跟踪矩阵|projectstory|track', 'subModule' => '');
 
+$lang->design->menu->all      = array('link' => '所有|design|browse|productID={PRODUCT}&browseType=all');
+$lang->design->menu->hlds     = array('link' => '概要设计|design|browse|productID={PRODUCT}&browseType=HLDS');
+$lang->design->menu->dds      = array('link' => '详细设计|design|browse|productID={PRODUCT}&browseType=DDS');
+$lang->design->menu->dbds     = array('link' => '数据库设计|design|browse|productID={PRODUCT}&browseType=DBDS');
+$lang->design->menu->ads      = array('link' => '接口设计|design|browse|productID={PRODUCT}&browseType=ADS');
+$lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
+
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
 
diff --git a/module/design/control.php b/module/design/control.php
index 40d4fff3d9..f54bbb66b9 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -55,6 +55,19 @@ class design extends control
         $actionURL = $this->createLink('design', 'browse', "productID=$productID&type=bySearch&queryID=myQueryID");
         $this->design->buildSearchForm($queryID, $actionURL);
 
+        /* Print top and right actions. */
+        $this->lang->TRActions  = '<div class="btn-group dropdown-hover">';
+        $this->lang->TRActions .= "<button type='button' class='btn btn-primary'>";
+        $this->lang->TRActions .= "<i class='icon-plus'></i> {$this->lang->design->create} <span class='caret'></span>";
+        $this->lang->TRActions .= '</button>';
+        $this->lang->TRActions .= "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
+
+        if(common::hasPriv('design', 'create'))      $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'create', "productID=$productID"), $this->lang->design->create, '', "class='btn btn-link'") . '</li>';
+        if(common::hasPriv('design', 'batchCreate')) $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'batchCreate', "productID=$productID"), $this->lang->design->batchCreate, '', "class='btn btn-link'") . '</li>';
+
+        $this->lang->TRActions .= '</ul>';
+        $this->lang->TRActions .= '</div>';
+
         /* Init pager and get designs. */
         $this->app->loadClass('pager', $static = true);
         $pager   = pager::init(0, $recPerPage, $pageID);
diff --git a/module/design/js/browse.js b/module/design/js/browse.js
new file mode 100644
index 0000000000..67aeb16078
--- /dev/null
+++ b/module/design/js/browse.js
@@ -0,0 +1,5 @@
+$(function()
+{
+    $('#subNavbar .nav li').removeClass('active');       
+    $('#subNavbar .nav li[data-id=' + type + ']').addClass('active');
+})
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index a987e0bde4..2a6c017ebc 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -12,24 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/sortable.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'>
-    <?php
-    foreach($lang->design->featureBar as $key => $label)
-    {
-        if(empty($key)) continue;
-        $active = $key == $type ? 'btn-active-text' : '';
-        $recTotalLabel = $key == $type ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
-        echo html::a(inlink('browse', "productID={$productID}&type=$key"),  "<span class='text'>$label</span>"  . $recTotalLabel, '', "class='btn btn-link $active'");
-    }
-    ?>
-    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->design->byQuery;?></a>
-  </div>
-  <div class='btn-toolbar pull-right'>
-    <?php common::printLink('design', 'batchCreate', "productID=$productID", "<i class='icon icon-plus'></i>" . $lang->design->batchCreate, '', "class='btn btn-primary'");?>
-    <?php common::printLink('design', 'create', "productID=$productID", "<i class='icon icon-plus'></i>" . $lang->design->create, '', "class='btn btn-primary'");?>
-  </div>
-</div>
+<?php js::set('type', strtolower($type));?>
 <div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module='design'></div>
 <div id="mainContent" class="main-table">
   <?php if(empty($designs)):?>