From a19e8ba578912f76d0c05d2ff674e460471a5dbc Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Sun, 9 Aug 2020 13:53:40 -0700
Subject: [PATCH] LP1849212: Make OPAC header links consistent

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates/opac/advanced.tt2        | 4 ++++
 Open-ILS/src/templates/opac/browse.tt2          | 5 +++++
 Open-ILS/src/templates/opac/course_browse.tt2   | 9 ++++++---
 Open-ILS/src/templates/opac/course_search.tt2   | 6 ++++--
 Open-ILS/src/templates/opac/parts/searchbar.tt2 | 1 +
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index d2549e94ba..b4be00391b 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -16,6 +16,10 @@
 
             <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
                     l('Browse the Catalog')%]</a></span>
+            [% IF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %]
+                <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_search') %]">[% l('Search for Courses') %]</a></span>
+                <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_browse') %]">[% l('Browse for Courses') %]</a></span>
+            [% END %]
             [% INCLUDE 'opac/parts/cart.tt2' %]
         </div>
         <div id="adv_search_parent">
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 97a8c0c180..cb60e3f14d 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -37,6 +37,11 @@
                     id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
         
             <span class="browse_the_catalog_lbl mobile_hide">[% l('Browse the Catalog') %]</span>
+            [% IF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %]
+                <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_search') %]">[% l('Search for Courses') %]</a></span>
+                <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_browse') %]">[% l('Browse for Courses') %]</a></span>
+
+            [% END %]
             [% INCLUDE 'opac/parts/cart.tt2' %]
         </div>
     </div>
diff --git a/Open-ILS/src/templates/opac/course_browse.tt2 b/Open-ILS/src/templates/opac/course_browse.tt2
index 5caabdc94c..addfd519ce 100644
--- a/Open-ILS/src/templates/opac/course_browse.tt2
+++ b/Open-ILS/src/templates/opac/course_browse.tt2
@@ -23,8 +23,11 @@
       <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Basic Search') %]</a></span>
       <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
         id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
-      <span class="browse_the_catalog_lbl mobile_hide">[% l('Browse the Catalog') %]</span>
-      <span class="browse_the_catalog_lbl mobile_hide">[% l('Search Courses') %]</span>
+      <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
+          l('Browse the Catalog')%]</a></span>
+      <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/course_search') %]">[%
+          l('Search Courses')%]</a></span>
+
       <span class="browse_the_catalog_lbl mobile_hide">[% l('Browse for Courses') %]</span>
       [% INCLUDE 'opac/parts/cart.tt2' %]
     </div>
@@ -158,4 +161,4 @@
   </div>
 </div>
 
-[% END %]
\ No newline at end of file
+[% END %]
diff --git a/Open-ILS/src/templates/opac/course_search.tt2 b/Open-ILS/src/templates/opac/course_search.tt2
index 979930a393..0e58fd0b91 100644
--- a/Open-ILS/src/templates/opac/course_search.tt2
+++ b/Open-ILS/src/templates/opac/course_search.tt2
@@ -12,13 +12,15 @@
 
 <div id="search-wrapper">
   <div id="search-box">
-    <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
     <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
       id="home_adv_search_link">[%l('Basic Search')%]</a></span>
     <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
       id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
     <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
       l('Browse the Catalog')%]</a></span>
+    <span class="browse_the_catalog_lbl mobile_hide">[% l('Search Courses') %]</span>
+    <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/course_browse') %]">[%
+          l('Browse Courses')%]</a></span>
     [% INCLUDE 'opac/parts/cart.tt2' %]
   </div>
 </div>
@@ -92,4 +94,4 @@
   </div>
 </div>
 
-[% END %]
\ No newline at end of file
+[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 72139869a9..35034f3279 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -46,6 +46,7 @@ END;
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, expert_search_parms.merge(general_search_parms, facet_search_parms, ['fi:has_browse_entry'])) %]">[% l('Browse the Catalog') %]</a></span>
         [% IF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %]
         <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_search') %]">[% l('Search for Courses') %]</a></span>
+        <span class="search_courses_label"><a href="[% mkurl(ctx.opac_root _ '/course_browse') %]">[% l('Browse for Courses') %]</a></span>
         [% END %]
         [% INCLUDE 'opac/parts/cart.tt2' %]
     </div>
-- 
2.11.0