From: Bill Erickson Date: Wed, 4 Apr 2012 15:48:02 +0000 (-0400) Subject: beanstalk : record details; copy table; more css X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=82002bee900df5a75b6351d1dcb34a65b8b36224;p=working%2FEvergreen.git beanstalk : record details; copy table; more css Signed-off-by: Bill Erickson --- 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 0000000000..5d9b920f35 Binary files /dev/null and b/Open-ILS/web/images/left_arrow.png differ diff --git a/Open-ILS/web/images/right_arrow.png b/Open-ILS/web/images/right_arrow.png new file mode 100644 index 0000000000..63e7d06c0e Binary files /dev/null and b/Open-ILS/web/images/right_arrow.png differ