From d56c86d35c7bc912e7771dfa4181ec14455d3a68 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 3 Apr 2012 14:24:55 -0400 Subject: [PATCH] beanstalk : pagination, results CSS Signed-off-by: Bill Erickson --- Open-ILS/src/templates/beanstalk/base.tt2 | 12 +++++ Open-ILS/src/templates/beanstalk/paginate.tt2 | 63 +++++++++++++++++++++++++++ Open-ILS/src/templates/beanstalk/results.tt2 | 57 ++++++++++++++---------- 3 files changed, 110 insertions(+), 22 deletions(-) create mode 100644 Open-ILS/src/templates/beanstalk/paginate.tt2 diff --git a/Open-ILS/src/templates/beanstalk/base.tt2 b/Open-ILS/src/templates/beanstalk/base.tt2 index 915ebcfb15..7f95b06bb2 100644 --- a/Open-ILS/src/templates/beanstalk/base.tt2 +++ b/Open-ILS/src/templates/beanstalk/base.tt2 @@ -8,6 +8,18 @@ [% END %] [% l('Catalog - [_1]', ctx.page_title) %] + + [% content %] diff --git a/Open-ILS/src/templates/beanstalk/paginate.tt2 b/Open-ILS/src/templates/beanstalk/paginate.tt2 new file mode 100644 index 0000000000..062c2cac5f --- /dev/null +++ b/Open-ILS/src/templates/beanstalk/paginate.tt2 @@ -0,0 +1,63 @@ +[% BLOCK results_paginate; + + page = CGI.param('page'); + page = page.match('^\d+$') ? page : 0; # verify page is a sane value + page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size); + ctx.result_start = 1 + ctx.page_size * page; + ctx.result_stop = ctx.page_size * (page + 1); + IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; + result_count = ctx.result_start; +%] + +
+
+ [% |l(ctx.result_start, ctx.result_stop, ctx.hit_count) %] + Results [_1] - [_2] of [_3] + [% END %] + + [% |l(page + 1, page_count) %](page [_1] of [_2])[% END %] + +
+
+ + + [% class = ''; + href = '#'; + IF page > 0; + href = mkurl('', {page => page - 1}); + ELSE; class = class _ 'invisible'; END; + %] + <-- [% l('Previous') %] + + + [% # show links to 4 previous pages, the current page, and 3 more pages. + added = 0; + pageitr = page - 5; + IF page_count > 1; # no need to paginate 1 page + WHILE (pageitr = pageitr + 1) < page_count; + IF pageitr < 0; NEXT; END; + IF pageitr == page; %] + [% pageitr + 1%] + [% ELSE %] + [% pageitr + 1%] + [% END; + added = added + 1; + IF added == 8; LAST; END; + END; + END; + %] + + + [% class = ''; + href = '#'; + IF (page + 1) < page_count; + href = mkurl('', {page => page + 1}); + ELSE; class = class _ ' invisible'; END; + %] + [% l('Next') %] --> + +
+
+[% END %] diff --git a/Open-ILS/src/templates/beanstalk/results.tt2 b/Open-ILS/src/templates/beanstalk/results.tt2 index 40c42d84d4..c98e31baf8 100644 --- a/Open-ILS/src/templates/beanstalk/results.tt2 +++ b/Open-ILS/src/templates/beanstalk/results.tt2 @@ -1,35 +1,48 @@ -[% PROCESS "opac/parts/header.tt2"; - WRAPPER "beanstalk/base.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - +[% PROCESS 'opac/parts/header.tt2'; + WRAPPER 'beanstalk/base.tt2'; + PROCESS 'opac/parts/misc_util.tt2'; + PROCESS 'beanstalk/paginate.tt2'; ctx.page_title = l("Search Results: ") _ CGI.param('query') | html; - page = CGI.param('page'); - page = page.match('^\d+$') ? page : 0; # verify page is a sane value - - page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size); - ctx.result_start = 1 + ctx.page_size * page; - ctx.result_stop = ctx.page_size * (page + 1); - IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; - result_count = ctx.result_start; - %] - +[% PROCESS results_paginate %] + +
[% FOR rec IN ctx.records; attrs = {marc_xml => rec.marc_xml}; - PROCESS get_marc_attrs args=attrs; - IF CGI.param('detail_record_view'); - attrs.title = attrs.title_extended; - END - -%] + PROCESS get_marc_attrs args=attrs %] + -[% END %] + [% END %] +
+ [% ident = attrs.isbn_clean || attrs.upc; IF ident; %] + [% l('Image') %]
+ [% END %] + 		+ [% title = attrs.title; + IF title AND title.length > 60; + title = title.substr(60, title.length, '...'); + END + %] l('Display record details for "[_1]"', attrs.title)) %] - >[% attrs.title | html %] + [% HTML.attributes(title => l('Display record details for "[_1]"', attrs.title)) %]>[% title | html %] + +
+ +
[% args.phys_desc | html %]
+
+[% PROCESS results_paginate %] + [% END %] -- 2.11.0