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>

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index d2549e9..b4be003 100644 (file)
--- 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 97a8c0c..cb60e3f 100644 (file)
--- 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 5caabdc..addfd51 100644 (file)
--- 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 979930a..0e58fd0 100644 (file)
--- 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 7213986..35034f3 100644 (file)
--- 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>