From de47b34b22ca877de366ad9f9744cd1621f21b77 Mon Sep 17 00:00:00 2001
From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Thu, 9 May 2013 14:18:03 -0400
Subject: [PATCH] OPAC Browse: fix 0-9 link in paging shortcuts; padding issues

Thanks to Ben Shum and Kathy Lussier for the bug reports.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Browse.pm | 7 ++++---
 Open-ILS/src/templates/opac/advanced.tt2                    | 3 +--
 Open-ILS/src/templates/opac/browse.tt2                      | 6 +++---
 Open-ILS/src/templates/opac/css/style.css.tt2               | 2 +-
 Open-ILS/src/templates/opac/parts/searchbar.tt2             | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Browse.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Browse.pm
index df3f86c71f..3917bc2921 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Browse.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Browse.pm
@@ -247,11 +247,12 @@ sub infer_browse_paging {
         $self->ctx->{more_forward} = 1;
     }
 
-    if ($offset > 0) {
+    if ($offset > 0 or (!$force_backward and $self->cgi->param('bpivot'))) {
         $self->ctx->{more_back} = 1;
     } elsif (scalar @$results < $limit) {
         $self->ctx->{more_back} = 0;
-    } else {
+    } elsif (not($self->cgi->param('bterm') eq '0' and
+        not defined $self->cgi->param('bpivot'))) {   # paging links
         $self->ctx->{more_back} = 1;
     }
 }
@@ -293,7 +294,7 @@ sub load_browse {
     $self->ctx->{more_forward} = 0;
     $self->ctx->{more_back} = 0;
 
-    if ($self->cgi->param('qtype') and $self->cgi->param('bterm')) {
+    if ($self->cgi->param('qtype') and defined $self->cgi->param('bterm')) {
 
         $self->leading_article_test(
             $self->cgi->param('qtype'),
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 5c5a2c9930..38f01fbe1a 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -6,14 +6,13 @@
     loc = ctx.search_ou;
 -%]
     <div id="search-wrapper">
-        <div id="search-tools">
+        <div id="search-box">
             <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
             <span><a href="[% mkurl(ctx.opac_root _ '/home') %]"
                     id="home_adv_search_link">[%l('Basic Search')%]</a></span>
 
             <span><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
                     l('Browse the Catalog')%]</a></span>
-
         </div>
         <div id="adv_search_parent">
             <div id="adv_search_tabs">
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 7e7a8b7b44..9e03d1e47e 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -16,7 +16,7 @@
     <div id="search-wrapper">
         [%# XXX TODO Give searchbar.tt2 more smarts so we can just do:
           # INCLUDE "opac/parts/searchbar.tt2" %]
-        <div id="search-tools">
+        <div id="search-box">
             <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Search the Catalog') %]</a></span>
             <span><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
                     id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
@@ -58,9 +58,9 @@
                     [% IF browse.english_pager; # XXX how to apply i18n here?
                         current_qtype = CGI.param('qtype') || 'title' %]
                     <span class="browse-shortcuts">
-                        <a href="[% mkurl('', {qtype => current_qtype, bterm => '0'}, ['boffset','bpivot']) %]">0-9</a>
+                        <a href="[% mkurl('', {qtype => current_qtype, bterm => '0'}, ['boffset','bpivot','bback']) %]">0-9</a>
                         [% FOR letter IN ['A'..'Z'] %]
-                            <a href="[% mkurl('', {qtype => current_qtype, bterm => letter}, ['boffset','bpivot']) %]">[% letter %]</a>
+                            <a href="[% mkurl('', {qtype => current_qtype, bterm => letter}, ['boffset','bpivot','bback']) %]">[% letter %]</a>
                         [% END %]
                     </span>
                     [% END %]
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index d11e0161ae..f645b21167 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1512,7 +1512,7 @@ a.preflib_change {
     font-style: italic;
 }
 
-#search-tools > span {
+#search-box > span {
     margin: 0 1em;
 }
 .browse-error {
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 52381a8ab6..84d6008c76 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -1,9 +1,9 @@
 [% PROCESS "opac/parts/org_selector.tt2" %]
-<div id="search-box">    
+<div id="search-wrapper">
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
-    <div id="search-tools">
+    <div id="search-box">
         <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
         <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
             id="home_adv_search_link">[% l('Advanced Search') %]</a>
-- 
2.11.0