From 33fbd64a7ea1cc775c7cd25166b28b3c638daba7 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 13 Jul 2022 12:49:18 -0400
Subject: [PATCH] LP1904036 Ang Patron Menu Entries

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/eg2/src/app/staff/nav.component.html | 16 ++++++++--------
 Open-ILS/src/templates/staff/navbar.tt2           | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

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 549fca112e..9db8b75ec2 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -17,7 +17,7 @@
          Search
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/search"
+          <a class="dropdown-item" routerLink="/staff/circ/patron/search"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="alt+s f4" keyDesc="Patron Search">
             <span class="material-icons" aria-hidden="true">person</span>
@@ -43,19 +43,19 @@
          <span i18n>Circulation</span>
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/bcsearch"
+          <a class="dropdown-item" routerLink="/staff/circ/patron/bcsearch"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="f1" keyDesc="Checkout">
             <span class="material-icons" aria-hidden="true">trending_up</span>
             <span i18n>Check Out</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/checkin/checkin"
+          <a class="dropdown-item" routerLink="/staff/circ/checkin"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="f2" keyDesc="Checkin">
             <span class="material-icons" aria-hidden="true">trending_down</span>
             <span i18n>Check In</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/checkin/capture"
+          <a class="dropdown-item" routerLink="/staff/circ/checkin/capture"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="shift+f2" keyDesc="Capture Holds">
             <span class="material-icons" aria-hidden="true">pin_drop</span>
@@ -65,19 +65,19 @@
             <span class="material-icons" aria-hidden="true">view_list</span>
             <span i18n>Pull List for Hold Requests</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/renew/renew"
+          <a class="dropdown-item" routerLink="/staff/circ/renew"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="ctrl+f2" keyDesc="Renew Items">
             <span class="material-icons" aria-hidden="true">autorenew</span>
             <span i18n>Renew Items</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/register"
+          <a class="dropdown-item" routerLink="/staff/circ/patron/register"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="shift+f1" keyDesc="Register Patron">
             <span class="material-icons" aria-hidden="true">person_add</span>
             <span i18n>Register Patron</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/last"
+          <a class="dropdown-item" routerLink="/staff/circ/patron/last"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="f8" keyDesc="Retrieve Last Patron">
             <span class="material-icons" aria-hidden="true">redo</span>
@@ -100,7 +100,7 @@
             <span i18n>Hold Groups</span>
           </a>
           <div class="dropdown-divider"></div>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/credentials">
+          <a class="dropdown-item" routerLink="/staff/circ/patron/credentials">
             <span class="material-icons" aria-hidden="true">check_circle</span>
             <span i18n>Verify Credentials</span>
           </a>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 9eaecdf050..57e82068c4 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -35,7 +35,7 @@
         </a>
         <ul uib-dropdown-menu>
           <li>
-            <a href="./circ/patron/search" target="_self"
+            <a href="/eg2/staff/circ/patron/search"
               eg-accesskey="[% l('alt+s') %] [% l('f4') %]" 
               eg-accesskey-desc="[% l('Patron search by name, address, etc.') %]">
               <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
@@ -70,7 +70,7 @@
 
         <ul uib-dropdown-menu>
           <li ng-if="username">
-            <a href="./circ/patron/bcsearch" target="_self"
+            <a href="/eg2/staff/circ/patron/bcsearch"
               eg-accesskey="[% l('f1') %]" 
               eg-accesskey-desc="[% l('Check Out') %]">
               <span class="glyphicon glyphicon-export" aria-hidden="true"></span>
@@ -86,7 +86,7 @@
             </a>
           </li>
           <li ng-if="username">
-            <a href="./circ/checkin/checkin" target="_self"
+            <a href="/eg2/staff/circ/checkin"
               eg-accesskey="[% l('f2') %]" 
               eg-accesskey-desc="[% l('Check In') %]">
               <span class="glyphicon glyphicon-import" aria-hidden="true"></span>
@@ -102,7 +102,7 @@
             </a>
           </li>
           <li>
-            <a href="./circ/checkin/capture" target="_self"
+            <a href="/eg2/staff/circ/checkin/capture"
               eg-accesskey="[% l('shift+f2') %]" 
               eg-accesskey-desc="[% l('Capture Holds') %]">
               <span class="glyphicon glyphicon-pushpin" aria-hidden="true"></span>
@@ -116,7 +116,7 @@
             </a>
           </li>
           <li ng-if="username">
-            <a href="./circ/renew/renew" target="_self"
+            <a href="/eg2/staff/circ/renew"
               eg-accesskey="[% l('ctrl+f2') %]" 
               eg-accesskey-desc="[% l('Renew items') %]">
               <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
@@ -133,7 +133,7 @@
             </a>
           </li>
           <li ng-if="username">
-            <a href="./circ/patron/register" target="_self"
+            <a href="/eg2/staff/circ/patron/register"
               eg-accesskey="[% l('shift+f1') %]" 
               eg-accesskey-desc="[% l('Register Patron') %]">
               <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
@@ -149,7 +149,7 @@
             </a>
           </li>
           <li ng-if="showRecentPatron">
-            <a href="./circ/patron/last" target="_self"
+            <a href="/eg2/staff/circ/patron/last"
               eg-accesskey="[% l('f8') %]" 
               eg-accesskey-desc="[% l('Retrieve Last Patron') %]">
               <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
@@ -157,20 +157,20 @@
             </a>
           </li>
           <li ng-if="showRecentPatrons">
-            <a href="./circ/patron/search?show_recent=1" target="_self"
+            <a href="/eg2/staff/circ/patron/search?show_recent=1"
               eg-accesskey-desc="[% l('Retrieve Recent Patrons') %]">
               <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>
               [% l('Retrieve Recent Patrons') %]
             </a>
           </li>
           <li>
-            <a href="./circ/patron/pending/list" target="_self">
+            <a href="/eg2/staff/circ/patron/pending/list">
               <span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span>
               [% l('Pending Patrons') %]
             </a>
           </li>
           <li>
-            <a href="./circ/patron/bucket/view" target="_self">
+            <a href="/eg2/staff/circ/patron/bucket/view">
               <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
               [% l('User Buckets') %]
             </a>
@@ -183,7 +183,7 @@
           </li>
           <li class="divider"></li>
           <li>
-            <a href="./circ/patron/credentials" target="_self">
+            <a href="/eg2/staff/circ/patron/credentials">
               <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
               <span>[% l('Verify Credentials') %]</span>
             </a>
-- 
2.11.0