From 82002bee900df5a75b6351d1dcb34a65b8b36224 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 4 Apr 2012 11:48:02 -0400 Subject: [PATCH] beanstalk : record details; copy table; more css Signed-off-by: Bill Erickson --- Open-ILS/src/templates/beanstalk/base.tt2 | 16 ++--- Open-ILS/src/templates/beanstalk/copy_table.tt2 | 74 ++++++++++++++++++++++++ Open-ILS/src/templates/beanstalk/paginate.tt2 | 11 ++-- Open-ILS/src/templates/beanstalk/record.tt2 | 5 ++ Open-ILS/src/templates/beanstalk/results.tt2 | 4 +- Open-ILS/web/images/left_arrow.png | Bin 0 -> 2879 bytes Open-ILS/web/images/right_arrow.png | Bin 0 -> 2878 bytes 7 files changed, 95 insertions(+), 15 deletions(-) create mode 100644 Open-ILS/src/templates/beanstalk/copy_table.tt2 create mode 100644 Open-ILS/web/images/left_arrow.png create mode 100644 Open-ILS/web/images/right_arrow.png diff --git a/Open-ILS/src/templates/beanstalk/base.tt2 b/Open-ILS/src/templates/beanstalk/base.tt2 index 56cbf75a19..354de218dc 100644 --- a/Open-ILS/src/templates/beanstalk/base.tt2 +++ b/Open-ILS/src/templates/beanstalk/base.tt2 @@ -10,20 +10,20 @@ [% l('Catalog - [_1]', ctx.page_title) %] - - [% content %] - + [% content %] diff --git a/Open-ILS/src/templates/beanstalk/copy_table.tt2 b/Open-ILS/src/templates/beanstalk/copy_table.tt2 new file mode 100644 index 0000000000..811ae8fab1 --- /dev/null +++ b/Open-ILS/src/templates/beanstalk/copy_table.tt2 @@ -0,0 +1,74 @@ +[%- + +# If being used in serial mode, flatten list of units so that they can be +# used like one long list of copies without changing so much code below. +IF serial_holdings; + copies = []; + FOREACH h IN serial_holdings; + units = h.units.slice(0); # copy + FOREACH unit IN units; + unit.holding_label = h.label; + END; + copies = copies.merge(units); + END; +END; + +FOREACH copy_info IN copies; + IF copy_info.call_number_label != '##URI##'; + has_copies = 'true'; + END; + IF copy_info.part_label != ''; + has_parts = 'true'; + END; + IF has_parts && has_copies; + LAST; + END; +END; +-%] + +[%- IF has_copies; %] + [%- last_cn = 0; + FOR copy_info IN copies; + callnum = copy_info.call_number_label; + NEXT IF callnum == '##URI##'; + + callnum_prefix = copy_info.call_number_prefix_label; + IF callnum_prefix != ""; + callnum = callnum_prefix _ " " _ callnum; + END; + + callnum_suffix = copy_info.call_number_suffix_label; + IF callnum_suffix != ""; + callnum = callnum _ " " _ callnum_suffix; + END; + -%] +
+
[% callnum | html %]
+
    +
  • [% l('Location: [_1]', ctx.get_aou(copy_info.circ_lib).name) | html %]
    • +
  • [% l('Shelf: [_1]', copy_info.copy_location) | html %]
    • +
  • [% l('Barcode: [_1]', copy_info.barcode) | html %]
    • +
  • [% l('Status: [_1]', copy_info.copy_status) | html %]
    • + [% IF copy_info.due_date %] +
  • [% l('Due Date: [_1]', date.format(ctx.parse_datetime(copy_info.due_date), DATE_FORMAT)) %]
    • + [% END %] +
+
+[% END %] +
+ [%- IF ctx.copy_offset > 0 AND NOT serial_holdings; + new_offset = ctx.copy_offset - ctx.copy_limit; + IF new_offset < 0; new_offset = 0; END %] + + « [% + l('Previous [_1]', ctx.copy_offset - new_offset) %] + + [%- END %] + [%- IF copies.size >= ctx.copy_limit AND NOT serial_holdings %] + + [% + l('Next [_1]', ctx.copy_limit) %] » + + [%- END %] + +[% END %] diff --git a/Open-ILS/src/templates/beanstalk/paginate.tt2 b/Open-ILS/src/templates/beanstalk/paginate.tt2 index 062c2cac5f..a80cb39889 100644 --- a/Open-ILS/src/templates/beanstalk/paginate.tt2 +++ b/Open-ILS/src/templates/beanstalk/paginate.tt2 @@ -10,6 +10,7 @@ %]
+ [% IF paginate_show_summary %]
[% |l(ctx.result_start, ctx.result_stop, ctx.hit_count) %] Results [_1] - [_2] of [_3] @@ -18,9 +19,9 @@ [% |l(page + 1, page_count) %](page [_1] of [_2])[% END %]
+ [% END %]
- [% class = ''; href = '#'; IF page > 0; @@ -28,7 +29,7 @@ ELSE; class = class _ 'invisible'; END; %] <-- [% l('Previous') %] + title='[% l("Previous page") %]'> [% # show links to 4 previous pages, the current page, and 3 more pages. @@ -38,9 +39,9 @@ WHILE (pageitr = pageitr + 1) < page_count; IF pageitr < 0; NEXT; END; IF pageitr == page; %] - [% pageitr + 1%] + [% pageitr + 1%] [% ELSE %] - [% pageitr + 1%] + [% pageitr + 1%] [% END; added = added + 1; IF added == 8; LAST; END; @@ -56,7 +57,7 @@ ELSE; class = class _ ' invisible'; END; %] [% l('Next') %] --> + title='[% l("Next page") %]'>
diff --git a/Open-ILS/src/templates/beanstalk/record.tt2 b/Open-ILS/src/templates/beanstalk/record.tt2 index d7bbf966de..e42882f59f 100644 --- a/Open-ILS/src/templates/beanstalk/record.tt2 +++ b/Open-ILS/src/templates/beanstalk/record.tt2 @@ -76,5 +76,10 @@ [%- END %] +
+[% l('Copies') %] +
+ +[%- INCLUDE "beanstalk/copy_table.tt2" copies=ctx.copies %] [% END %] diff --git a/Open-ILS/src/templates/beanstalk/results.tt2 b/Open-ILS/src/templates/beanstalk/results.tt2 index 54d9d1ea33..0274c85a3f 100644 --- a/Open-ILS/src/templates/beanstalk/results.tt2 +++ b/Open-ILS/src/templates/beanstalk/results.tt2 @@ -5,7 +5,7 @@ ctx.page_title = l("Search Results: ") _ CGI.param('query') | html; %] -[% PROCESS results_paginate %] +[% PROCESS results_paginate paginate_show_summary=1 %] [% FOR rec IN ctx.records; @@ -43,6 +43,6 @@
-[% PROCESS results_paginate %] +[% PROCESS results_paginate paginate_show_summary=0 %] [% END %] diff --git a/Open-ILS/web/images/left_arrow.png b/Open-ILS/web/images/left_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..5d9b920f35492102fea68c3ed1e15986151334f0 GIT binary patch literal 2879 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 literal 0 HcmV?d00001 -- 2.11.0