From 6bdcf59d8012165a9e7b5fbda2da811a03bbfd22 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 3 Mar 2020 18:24:08 -0500
Subject: [PATCH] NAV squash

NAV add provider search placeholder menu entry to eg2

NAV Several provider entry points

NAV add provider search to AngularJS Acq menu

NAV move the provider search nav item
---
 .../src/app/staff/admin/acq/admin-acq-splash.component.html |  5 +----
 Open-ILS/src/eg2/src/app/staff/nav.component.html           | 12 ++++++++++++
 Open-ILS/src/templates/menu.tt2                             |  1 +
 Open-ILS/src/templates/staff/admin/acq/t_splash.tt2         |  2 +-
 Open-ILS/src/templates/staff/navbar.tt2                     | 13 +++++++++++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
index c6d73076d4..c0f8961313 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
@@ -53,10 +53,7 @@
     <eg-link-table-link i18n-label label="Line Item MARC Attribute Definitions"
       routerLink="/staff/admin/acq/lineitem_marc_attr_definition"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Providers"
-      url="/eg/staff/admin/acq/conify/provider"></eg-link-table-link>
-      <!-- TODO
-      routerLink="/staff/admin/acq/provider"></eg-link-table-link>
-      -->
+      routerLink="/staff/acq/provider"></eg-link-table-link>
   </eg-link-table>
 </div>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 372299acb0..51b3a4f992 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -238,10 +238,22 @@
         <div class="dropdown-menu" ngbDropdownMenu>
           <a class="dropdown-item" 
             routerLink="/staff/acq/search">
+            <span class="material-icons">search</span>
+            <span i18n>General Search</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" 
+            routerLink="/staff/acq/search">
             <span class="material-icons" aria-hidden="true">search</span>
             <span i18n>General Search</span>
           </a>
           <div class="dropdown-divider"></div>
+          <a class="dropdown-item" 
+            routerLink="/staff/acq/provider">
+            <span class="material-icons" aria-hidden="true">search</span>
+            <span i18n>Provider Search</span>
+          </a>
+          <div class="dropdown-divider"></div>
           <a class="dropdown-item"
             routerLink="/staff/acq/search/selectionlists">
             <span class="material-icons" aria-hidden="true">view_list</span>
diff --git a/Open-ILS/src/templates/menu.tt2 b/Open-ILS/src/templates/menu.tt2
index fab8407da6..62e1fb0c26 100644
--- a/Open-ILS/src/templates/menu.tt2
+++ b/Open-ILS/src/templates/menu.tt2
@@ -79,6 +79,7 @@
                                 onClick="location.href = '[% ctx.base_path %]/acq/funding_source/list';">[% l('Funding Sources') %]</div>
                         <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/conify/global/acq/provider';">[% l('Providers') %]</div>
+                                <!-- what about this one? onClick="location.href = '/eg2/staff/acq/provider';">[% l('Providers') %]</div> -->
                         <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
                                 onClick="location.href = '[% ctx.base_path %]/acq/currency_type/list';">[% l('Currency Types') %]</div>
                         <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" 
diff --git a/Open-ILS/src/templates/staff/admin/acq/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/acq/t_splash.tt2
index 76ca28a783..d51eb7a71a 100644
--- a/Open-ILS/src/templates/staff/admin/acq/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/acq/t_splash.tt2
@@ -27,7 +27,7 @@
     ,[ l('Invoice Payment Method'), "./admin/acq/conify/invoice_payment_method" ]
     ,[ l('Line Item Alerts'), "./admin/acq/conify/lineitem_alert" ]
     ,[ l('Line Item MARC Attribute Definitions'), "./admin/acq/conify/lineitem_marc_attr_def" ]
-    ,[ l('Providers'), "./admin/acq/conify/provider" ]
+    ,[ l('Providers'), "/eg2/admin/acq/provider" ]
    ];
 
    USE table(interfaces, cols=3);
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index cea8d68b6a..58ca213166 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -357,9 +357,22 @@
         <ul uib-dropdown-menu>
           <li>
             <a href="/eg2/staff/acq/search" target="_self">
+              <span class="glyphicon glyphicon-search"></span>
+              [% l('General Search') %]
+            </a>
+          </li>
+          <li class="divider"></li>
+          <li>
+            <a href="/eg2/staff/acq/search" target="_self">
               <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
               [% l('General Search') %]
             </a>
+          <li class="divider"></li>
+          <li>
+            <a href="/eg2/staff/acq/provider" target="_self">
+              <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              [% l('Provider Search') %]
+            </a>
           </li>
           <li class="divider"></li>
           <li>
-- 
2.11.0