From 349fb2ae629dc8db8a0dcca522df1b3730150052 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 23 Dec 2014 16:09:53 -0500 Subject: [PATCH] Updates to adjust layout issues with new UI changes. Signed-off-by: Terran McCanna --- .../src/templates/opac/parts/record/summary.tt2 | 45 +++++++++++----------- Open-ILS/src/templates/opac/parts/result/table.tt2 | 6 +-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index a53ad4a771..635deaab36 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -157,6 +157,28 @@ IF num_uris > 0; [%- END %] +[%- merged_uris = args.uris.merge(args.online_res); +num_uris = merged_uris.size; +IF num_uris > 0; +-%] +

[% l("Related electronic resources") %]

+
+ [%- IF num_uris > 1 %]
    [% END %] + [%- FOR uri IN merged_uris %] + [%- IF num_uris == 1 -%] +

    + [%- ELSE -%] +

  • + [%- END -%] + [% uri.link %][% ' - ' _ uri.note IF uri.note %] + + [%- IF attrs.gtin13; ''; END; %] + [%- IF num_uris == 1 %]

    [% ELSE %]
  • [% END %] + [%- END %] + [%- IF num_uris > 1 %]
[% END %] +
+[%- END %] + [%- # Hold/copy summary IF ctx.copy_summary.0.count %] @@ -182,29 +204,6 @@ IF num_uris > 0;

- -[%- merged_uris = args.uris.merge(args.online_res); -num_uris = merged_uris.size; -IF num_uris > 0; --%] -

[% l("Related electronic resources") %]

-
- [%- IF num_uris > 1 %]
    [% END %] - [%- FOR uri IN merged_uris %] - [%- IF num_uris == 1 -%] -

    - [%- ELSE -%] -

  • - [%- END -%] - [% uri.link %][% ' - ' _ uri.note IF uri.note %] - - [%- IF attrs.gtin13; ''; END; %] - [%- IF num_uris == 1 %]

    [% ELSE %]
  • [% END %] - [%- END %] - [%- IF num_uris > 1 %]
[% END %] -
-[%- END %] - [%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %] diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index d57b7bd2f9..7069d96c60 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -143,7 +143,7 @@ END; src="[% format.icon %]" /> [% format.label | html %] [% END %] - [%- END %] + [%- END %]
[%- UNLESS CGI.param('detail_record_view') OR (show_more_details.default == 'true' OR show_more_details.default == 'hide'); @@ -166,9 +166,9 @@ END; [% IF args.holdings.size > 0 %] - [% l('Call number:') %] + [% l('Call Number:') %] - [% args.holdings.0.label | html %] + [% args.holdings.0.label | html %] [% END %] [% END %] -- 2.11.0