From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 27 Mar 2020 17:17:38 +0000 (-0400)
Subject: LPXXX Staff catalog links template updates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=18dccc8fa14a067ca8223ab4eaf265d6307700e6;p=working%2FEvergreen.git

LPXXX Staff catalog links template updates

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html
index b3b39a8a16..480e5548ea 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html
@@ -114,10 +114,9 @@
   <a *ngIf="queueType=='bib'" routerLink="/staff/catalog/record/{{row.imported_as}}">
     {{row.imported_as}}
   </a>
-  <a *ngIf="queueType=='auth'" href="/eg/staff/cat/catalog/authority/{{row.imported_as}}/marc_edit">
+  <a *ngIf="queueType=='auth'" routerLink="/staff/cat/authority/edit/{{row.imported_as}}">
     {{row.imported_as}}
   </a>
-
 </ng-template>
 
 
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 5310b5b340..6b28fece29 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -27,7 +27,7 @@
             <span class="material-icons">assignment</span>
             <span i18n>Search for Items by Barcode</span>
           </a>
-          <a href="/eg/staff/cat/catalog/index" class="dropdown-item"
+          <a class="dropdown-item" routerLink="/staff/catalog"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
             keySpec="f3" keyDesc="Catalog">
             <span class="material-icons">search</span>
@@ -150,17 +150,15 @@
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
 
-          <a href="/eg/staff/cat/catalog/index" class="dropdown-item"
+          <a class="dropdown-item" routerLink="/staff/catalog/search"
             egAccessKey keyCtx="navbar"i18n-keySpec i18n-keyDesc
             keySpec="f3" keyDesc="Catalog">
             <span class="material-icons">search</span>
             <span i18n>Search the Catalog</span>
           </a>
-          <a *ngIf="showAngularCatalog"
-            class="dropdown-item"
-            routerLink="/staff/catalog/search">
+          <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
             <span class="material-icons">search</span>
-            <span i18n>Staff Catalog (Experimental)</span>
+            <span i18n>Search the Catalog (Legacy)</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/cat/item/search"
             egAccessKey keyCtx="navbar" i18n-keySpec i18n-keyDesc
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts
index 5627f762ba..6825464e55 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts
@@ -104,11 +104,10 @@ export class StaffNavComponent implements OnInit, OnDestroy {
         this.printer.reprintLast();
     }
 
-    // TODO: Point to Angular catalog when the time comes
     retrieveLastRecord() {
         const recId = this.store.getLocalItem('eg.cat.last_record_retrieved');
         if (recId) {
-            window.location.href = '/eg/staff/cat/catalog/record/' + recId;
+            this.router.navigate(['/staff/catalog/record/' + recId]);
         }
     }
 }
diff --git a/Open-ILS/src/eg2/src/app/staff/splash.component.ts b/Open-ILS/src/eg2/src/app/staff/splash.component.ts
index af6b647dfa..6756b6519c 100644
--- a/Open-ILS/src/eg2/src/app/staff/splash.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/splash.component.ts
@@ -23,17 +23,10 @@ export class StaffSplashComponent implements OnInit {
     searchCatalog(): void {
         if (!this.catSearchQuery) { return; }
 
-        /* Route to angular6 catalog
         this.router.navigate(
             ['/staff/catalog/search'],
             {queryParams: {query : this.catSearchQuery}}
         );
-        */
-
-        // Route to AngularJS / TPAC catalog
-        window.location.href =
-            '/eg/staff/cat/catalog/results?query=' +
-            encodeURIComponent(this.catSearchQuery);
     }
 }
 
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_pending.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_pending.tt2
index 431d2d4d46..043cffc467 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_pending.tt2
@@ -54,7 +54,7 @@
 
   <eg-grid-field label="[% l('Title') %]"
     path="call_number.record.simple_record.title" visible>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['call_number.record.id']}}">
+    <a href="/eg2/staff/catalog/record/{{item['call_number.record.id']}}">
       {{item['call_number.record.simple_record.title']}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
index adc1f5013a..7a914bb3b9 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
@@ -42,7 +42,7 @@
 
   <eg-grid-field label="[% l('Title') %]"
     path="call_number.record.simple_record.title" visible>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['call_number.record.id']}}">
+    <a href="/eg2/staff/catalog/record/{{item['call_number.record.id']}}">
       {{item['call_number.record.simple_record.title']}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
index ec4473be20..80e1ed4ac1 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2
@@ -18,7 +18,7 @@
     handler="resetPendingList"></eg-grid-action>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
+    <a href="/eg2/staff/catalog/record/{{item.id}}">
     {{item.title}} <span ng-show="item.id" class="glyphicon glyphicon-new-window"/>
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
index 02506bc951..038fb521c0 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2
@@ -44,7 +44,7 @@
     handler="addToBucket"></eg-grid-action>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
+    <a href="/eg2/staff/catalog/record/{{item.id}}">
     {{item.title}} <span ng-show="item.id" class="glyphicon glyphicon-new-window"/>
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
index a30697c6e5..26cd353bb2 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
@@ -35,7 +35,7 @@
   <eg-grid-field path="id" required hidden></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.id}}">
+    <a href="/eg2/staff/catalog/record/{{item.id}}">
       {{item.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index ca61728a29..c01d1901be 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -89,7 +89,7 @@
   <eg-grid-field label="[% l('Item Status') %]"    path="status.name" visible></eg-grid-field>
   <eg-grid-field label="[% l('Title') %]"       
     path="call_number.record.simple_record.title" visible>
-    <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['call_number.record.id']}}">
+    <a href="/eg2/staff/catalog/record/{{item['call_number.record.id']}}">
       {{item['call_number.record.simple_record.title']}} <span ng-show="item['call_number.record.id']" class="glyphicon glyphicon-new-window"/>
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
index c98b087034..ce4af2e8e1 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
@@ -7,8 +7,7 @@
         </span>
     </div>
     <div ng-if="!noMarcLink" class="flex-cell">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}/marc_html">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}/marc_html">
         (MARC)
       </a>
     </div>
@@ -30,7 +29,7 @@
   </div>
 </div>
 <div ng-if="record.merged_to()" class="row alert alert-warning">
-  <a href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.merged_to()}}">
+  <a href="/eg2/staff/catalog/record/{{record.merged_to()}}">
     [% l('Record merged to #[_1] on [_2]', 
          '{{record.merged_to()}}',
          '{{record.merge_date() | date:$root.egDateAndTimeFormat}}') 
@@ -41,8 +40,7 @@
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Title:') %]</div>
     <div class="flex-cell flex-2">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}">
         {{rec_display.title}}
       </a>
     </div>
@@ -64,8 +62,7 @@
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Title:') %]</div>
     <div class="flex-cell flex-2">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}">
         {{rec_display.title}}
       </a>
     </div>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2
index 7095c5dee6..10719aa2b6 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2
@@ -7,8 +7,7 @@
         </span>
     </div>
     <div ng-if="!noMarcLink" class="flex-cell flex-2">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}/marc_html">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}/marc_html">
         (MARC)
       </a>
     </div>
@@ -27,7 +26,7 @@
   </div>
 </div>
 <div ng-if="record.merged_to()" class="row alert alert-warning">
-  <a href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.merged_to()}}">
+  <a href="/eg2/staff/catalog/record/{{record.merged_to()}}">
     [% l('Record merged to #[_1] on [_2]', 
          '{{record.merged_to()}}',
          '{{record.merge_date() | date:$root.egDateAndTimeFormat}}') 
@@ -38,8 +37,7 @@
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Title:') %]</div>
     <div class="flex-cell flex-3">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}">
         {{rec_display.title}}
       </a>
     </div>
@@ -64,8 +62,7 @@
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Title:') %]</div>
     <div class="flex-cell flex-3">
-      <a target="_self" 
-        href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.id()}}">
+      <a href="/eg2/staff/catalog/record/{{record.id()}}">
         {{rec_display.title}}
       </a>
     </div>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 5a27145747..19b1d3358e 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -96,7 +96,7 @@
     path='circ.xact_start'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record.doc_id()}}">
+    <a href="/eg2/staff/catalog/record/{{item.record.doc_id()}}">
       {{item.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index 2348f992cd..eda5f059ef 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -94,8 +94,7 @@
   <eg-grid-field name="title" 
     path="current_copy.call_number.record.simple_record.title" 
     label="[% l('Title') %]">
-    <a target="_self" 
-      href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record_id}}">
+    <a href="/eg2/staff/catalog/record/{{item.record_id}}">
       {{item.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
index c385a6f8a2..0bac301e66 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
@@ -76,7 +76,7 @@
   <eg-grid-field label="[% l('Post-Clear') %]" path='post_clear'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path='hold.title'>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.hold.record_id}}">
+    <a href="/eg2/staff/catalog/record/{{item.hold.record_id}}">
       {{item.hold.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
index 5c31297d9b..e21a3019ad 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
@@ -21,7 +21,7 @@
     <eg-grid-field path="payment_type" label="Payment Type"></eg-grid-field>
     <eg-grid-field label="[% l('Title') %]" name="title" 
       path="xact.circulation.target_copy.call_number.record.simple_record.title">
-      <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record_id}}">{{item.title}}</a>
+      <a href="/eg2/staff/catalog/record/{{item.record_id}}">{{item.title}}</a>
     </eg-grid-field>
 
     <!-- needed for bib link -->
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
index 4be0ef08b6..f08b03414d 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
@@ -25,7 +25,7 @@
 
     <eg-grid-field label="[% l('Title') %]" name="title" 
       path="circulation.target_copy.call_number.record.simple_record.title">
-      <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record_id}}">{{item.title}}</a>
+      <a href="/eg2/staff/catalog/record/{{item.record_id}}">{{item.title}}</a>
     </eg-grid-field>
 
     <!-- needed for bib link -->
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index d622db6c47..ccd7320571 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -74,7 +74,7 @@
 
   <eg-grid-field label="[% l('Title') %]" name="title"
     path='circulation.target_copy.call_number.record.simple_record.title'>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record_id}}">{{item.title}}</a>
+    <a href="/eg2/staff/catalog/record/{{item.record_id}}">{{item.title}}</a>
   </eg-grid-field>
   <!-- fetch the record ID so we can link to it.  hide it by default -->
   <eg-grid-field path="circulation.target_copy.call_number.record.id" 
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 7cbe4927c7..8744e0f7d8 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -136,7 +136,7 @@
     path='circ.renewal_remaining'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.acn.record()}}">
+    <a href="/eg2/staff/catalog/record/{{item.acn.record()}}">
       {{item.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 961ad03fc6..d2e8d576ad 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -66,7 +66,7 @@
   <eg-grid-field label="[% l('Pickup Library') %]" path='hold.pickup_lib.shortname'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path='mvr.title'>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.mvr.doc_id()}}">
+    <a href="/eg2/staff/catalog/record/{{item.mvr.doc_id()}}">
       {{item.mvr.title()}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index b7857aa151..33ef942ddb 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -96,7 +96,7 @@
   <eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
   <eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>
   <eg-grid-field label="[% l('Title') %]" path="target_copy.call_number.record.wide_display_entry.title" name="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.target_copy().call_number().record().id()}}">
+    <a href="/eg2/staff/catalog/record/{{item.target_copy().call_number().record().id()}}">
       {{item.target_copy().call_number().record().wide_display_entry().title()}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 4d5ff59486..b08cdff7d4 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -10,7 +10,7 @@
   <div class="col-md-2">{{xact.summary().total_owed() | currency}}</div>
   <div class="col-md-2 strong-text">[% l('Title') %]</div>
   <div class="col-md-2">
-    <a ng-if="title_id" target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{title_id}}">{{title}}</a>
+    <a ng-if="title_id" href="/eg2/staff/catalog/record/{{title_id}}">{{title}}</a>
     <span ng-if="!title_id">{{title}}</span>
   </div>
 </div>
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
index 0a2caad72a..6447ecce20 100644
--- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
@@ -121,7 +121,7 @@
     path='circ.renewal_remaining'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.doc_id()}}">
+    <a href="/eg2/staff/catalog/record/{{record.doc_id()}}">
       {{item.title}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
index d15120021e..0719ed909a 100644
--- a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
@@ -57,7 +57,7 @@
   <eg-grid-field path='target_copy.call_number.label' hidden required sortable></eg-grid-field>
   <eg-grid-field label="[% l('CN Suffix') %]" path="target_copy.call_number.suffix.label"></eg-grid-field>
   <eg-grid-field path='target_copy.call_number.record.simple_record.title' label="[% l('Title') %]" sortable>
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['target_copy.call_number.record.simple_record.id']}}">
+    <a href="/eg2/staff/catalog/record/{{item['target_copy.call_number.record.simple_record.id']}}">
       {{item['target_copy.call_number.record.simple_record.title']}}
     </a>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 220c3d1d1f..c6d678623e 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -51,9 +51,9 @@
             </a>
           </li>
           <li>
-            <a href="./cat/catalog/index" target="_self"
+            <a href="/eg2/staff/catalog/search"
               eg-accesskey="[% l('f3') %]" 
-              eg-accesskey-desc="[% l('OPAC') %]">
+              eg-accesskey-desc="[% l('Catalog') %]">
               <span class="glyphicon glyphicon-search"></span>
               <span>[% l('Search the Catalog') %]</span>
             </a>
@@ -245,19 +245,16 @@
         <a href uib-dropdown-toggle>[% l('Cataloging') %]<b class="caret"></b>
         </a>
         <ul uib-dropdown-menu>
-          <li>
-            <a href="./cat/catalog/index" target="_self">
+          <li> 
+            <a href="/eg2/staff/catalog/search">
               <span class="glyphicon glyphicon-search"></span>
-              [% l('Search the Catalog') %]
+              <span>[% l('Search the Catalog') %]</span>
             </a>
           </li>
-          <!--
-            Link to experimental Angular staff catalog.
-          -->
-          <li ng-if="showAngularCatalog">
-            <a href="/eg2/staff/catalog/search">
+          <li>
+            <a href="./cat/catalog/index" target="_self">
               <span class="glyphicon glyphicon-search"></span>
-              <span>[% l('Staff Catalog (Experimental)') %]</span>
+              [% l('Search the Catalog (Legacy)') %]
             </a>
           </li>
           <li>
diff --git a/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2
index 03820d284c..6ca1e40773 100644
--- a/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2
@@ -7,7 +7,7 @@
     <div class="modal-body">
         <div ng-repeat="legacy in legacies">
             <div uib-tooltip="[% l('Record ID [_1]', '{{legacy.mvr.doc_id}}') %]" tooltip-placement="left">
-                <a target="_blank" href="/eg/staff/cat/catalog/record/{{legacy.mvr.doc_id}}">{{legacy.mvr.title}}</a>
+                <a href="/eg2/staff/catalog/record/{{legacy.mvr.doc_id}}">{{legacy.mvr.title}}</a>
             </div>
             <div>
                 {{legacy.mvr.physical_description}}