From c7c84ca137449a26388d22c3063e84af749e1db6 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 | 10 +++--
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 01349e7b2b..6ebc0120ed 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -159,6 +159,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
%]
@@ -184,29 +206,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 b056add45c..e2fae96a26 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -143,8 +143,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);
@@ -169,9 +171,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