From 20bd496d46b2bbb24206410a803f29d351ef5c76 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 5 Jan 2021 14:09:36 -0500
Subject: [PATCH] LP1908619 Adjustments to Staff Search Preferences Page

Change 'Catalog Preferences' to 'Search Preferences' and
add a Return button at the bottom to make it more obvious how
to get out of the interface.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jennifer Bruch <jbruch@sparkpa.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../app/staff/catalog/basket-actions.component.html    |  2 +-
 .../src/eg2/src/app/staff/catalog/prefs.component.html | 10 +++++++++-
 .../src/eg2/src/app/staff/catalog/prefs.component.ts   |  8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html
index 7014944d49..baf2814bae 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/basket-actions.component.html
@@ -42,7 +42,7 @@
     <!-- Note this Prefernces links is not specific to Basket handling,
         but it's here since it allowed for consistent formatting -->
     <a routerLink="/staff/catalog/prefs" queryParamsHandling="merge">
-      <button class="btn btn-light" i18n>Catalog Preferences</button>
+      <button class="btn btn-light" i18n>Search Preferences</button>
     </a>
   </div>
 </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
index a3a595a7d0..abe932c840 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
@@ -1,6 +1,6 @@
 <eg-catalog-search-form #searchForm></eg-catalog-search-form>
 
-<eg-staff-banner bannerText="Catalog Preferences"></eg-staff-banner>
+<eg-staff-banner bannerText="Search Preferences"></eg-staff-banner>
 
 <eg-string #successMsg i18n-text text="Setting Update Succeeded"></eg-string>
 <eg-string #failMsg i18n-text text="Setting Update Failed"></eg-string>
@@ -103,3 +103,11 @@
     Add the 'Exclude Electronic Resources' checkbox to the main search form.
   </div>
 </div>
+<div class="row">
+  <div class="col-lg-1">
+  <button class="btn btn-info label-with-material-icon" (click)="goBack()" [disabled]="hasNoHistory()">
+      <span class="material-icons">keyboard_backspace</span>
+      <span i18n>Return</span>
+  </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.ts
index a186fc81ed..a76955effc 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.ts
@@ -79,5 +79,13 @@ export class PreferencesComponent implements OnInit {
             .then(_ => this.toast.success(this.successMsg.text))
             .then(_ => value);
     }
+
+    hasNoHistory(): boolean {
+        return history.length === 0;
+    }
+
+    goBack() {
+        history.back();
+    }
 }
 
-- 
2.43.2