From: Terran McCanna Date: Tue, 23 Dec 2014 21:09:53 +0000 (-0500) Subject: Updates to adjust layout issues with new UI changes. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5f2462c39a5a264810798f96f7d7d2c45361b6de;p=evergreen%2Fpines.git Updates to adjust layout issues with new UI changes. Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index f82300cc0c..694eddd570 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -222,6 +222,28 @@ END; ======= [%- 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 >>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions. @@ -255,29 +277,6 @@ INCLUDE "opac/parts/record/copy_counts.tt2"; <<<<<<< HEAD ======= - -[%- 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 22322e8de9..675448ca0e 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -148,8 +148,10 @@ END; src="[% format.icon %]" /> [% format.label | html %] [% END %] - [%- END %] - [%- UNLESS show_detail_view; + [%- END %]
+ [%- UNLESS CGI.param('detail_record_view') + OR (show_more_details.default == 'true' + OR show_more_details.default == 'hide'); IF attrs.pubdate; pubdate_clean = attrs.pubdate | html; l("Publication Date: ([_1])", pubdate_clean); @@ -174,9 +176,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 %]