From f6ccee23e99d1fbda4cbaa2c4e053499155e1dd9 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Mon, 19 Jan 2015 18:14:12 -0500 Subject: [PATCH] Tweaks to layout of holdings on item details page. Signed-off-by: Terran McCanna Conflicts: Open-ILS/src/templates/opac/parts/record/copy_table.tt2 --- .../src/templates/opac/parts/library_name_link.tt2 | 6 +++- .../src/templates/opac/parts/record/copy_table.tt2 | 38 ++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Open-ILS/src/templates/opac/parts/library_name_link.tt2 b/Open-ILS/src/templates/opac/parts/library_name_link.tt2 index 7e8202bc93..96fadcaa61 100644 --- a/Open-ILS/src/templates/opac/parts/library_name_link.tt2 +++ b/Open-ILS/src/templates/opac/parts/library_name_link.tt2 @@ -15,8 +15,12 @@ lib_url = mkurl(opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1); END; IF lib_url; ''; END; - ''; parent_org_name _ ': ' _ org_name | html; ''; + ''; parent_org_name _ ':' | html; ''; + '
      '; + IF lib_url; ''; END; + org_name; IF lib_url; ''; END; + -%] diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 index 32d005d4e1..65f9a4e01e 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 @@ -26,7 +26,7 @@ FOREACH copy_info IN copies; END; -%] [%- IF has_copies; %] - +
[% IF serial_holdings -%] @@ -54,7 +54,7 @@ END; [%- FOREACH peer IN ctx.foreign_copies; FOREACH bib IN peer.foreign_copy_maps; %] - - - - - + + + + [%- IF ctx.is_staff %] - + [%- END %] [%- END; # FOREACH peer @@ -96,20 +96,21 @@ END; # FOREACH bib [%- copy_info.holding_label | html; -%] [%- ELSE %] - [% END %] - - + + [%- IF has_parts == 'true' %] - + [%- END %] - [%- IF ctx.is_staff %] - - [% END # is_staff %] [% IF ctx.is_staff OR serial_holdings %] - [%- END %] - -
+
[%- bib_lib_name = ctx.get_aou(bib.target_copy.circ_lib).name | html; l("[_1] (foreign item)", bib_lib_name); -%]
  • @@ -65,12 +65,12 @@ END;
[% copy_info.copy_location | html %][% bib.target_copy.call_number.label | html %][% bib.target_copy.barcode | html %][% copy_info.copy_status | html %][% copy_info.copy_location | html %][% bib.target_copy.call_number.label | html %][% bib.target_copy.barcode | html %][% copy_info.copy_status | html %][% copy_info.due_date | html %][% copy_info.due_date | html %]
+ [%- INCLUDE "opac/parts/library_name_link.tt2"; -%] [% copy_info.copy_location | html %][% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](Send Text Message)[% END %][% copy_info.copy_location | html %][% callnum | html %][% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %]
(Send Call No. in Text Message)[% END %]		[% copy_info.part_label | html %][% copy_info.part_label | html %] + [% copy_info.barcode | html -%] - [% IF ctx.is_staff %] + [% IF ctx.is_staff %]
[%- IF ctx.is_browser_staff %] [% l('view') %] [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) @@ -136,11 +137,11 @@ END; # FOREACH bib END; -%] 		+ [% copy_info.age_protect ? ctx.get_crahp(copy_info.age_protect).name : l('None') | html %] [% + [% IF ctx.get_org_setting(copy_info.circ_lib, 'circ.holds.age_protect.active_date') == 1; disp_date = copy_info.active_date ? copy_info.active_date : copy_info.create_date; ELSE; @@ -158,7 +159,7 @@ END; # FOREACH bib %][% # Show copy/volume hold links to staff (without + [% # Show copy/volume hold links to staff (without # checking whether they have permissions to do those). overall_holdable = ( copy_info.holdable == 't' AND @@ -206,11 +207,12 @@ END; # FOREACH bib l("Not holdable"); END %][%- + [%- schema_copy_status.${copy_info.status_code}; copy_info.copy_status | html; -%][% + [%- IF ctx.is_staff %] + [% IF copy_info.due_date; date.format( ctx.parse_datetime(copy_info.due_date), -- 2.11.0