From 0d8c78518d898f902dd5edc63f219fbb7657bcd1 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
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 <tmccanna@georgialibraries.org>
---
 .../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 e619738cfd..e2a440d084 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -240,6 +240,28 @@ END;
 =======
 [%- END %]
 
+[%- merged_uris = args.uris.merge(args.online_res);
+num_uris = merged_uris.size;
+IF num_uris > 0;
+-%]
+<h2 class="rdetail_uris" style="margin-top:50px;" >[% l("Related electronic resources") %]</h2>
+<div class="rdetail_uris">
+    [%- IF num_uris > 1 %]<ul>[% END %]
+    [%- FOR uri IN merged_uris %]
+        [%- IF num_uris == 1 -%]
+            <p class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
+        [%- ELSE -%]
+            <li class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
+        [%- END -%]
+        <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+        <link property="availability" href="http://schema.org/OnlineOnly" />
+        [%- IF attrs.gtin13; '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />'; END; %]
+        [%- IF num_uris == 1 %]</p>[% ELSE %]</li>[% END %]
+    [%- END %]
+    [%- IF num_uris > 1 %]</ul>[% END %]
+</div>
+[%- END %]
+
 [%- # Hold/copy summary
     IF ctx.copy_summary.0.count
 >>>>>>> fe23cd5... OPAC UI modifications as per OPAC Working Group suggestions.
@@ -273,29 +295,6 @@ INCLUDE "opac/parts/record/copy_counts.tt2";
 <<<<<<< HEAD
 =======
 
-<!-- Electronic Resources Section -->
-[%- merged_uris = args.uris.merge(args.online_res);
-num_uris = merged_uris.size;
-IF num_uris > 0;
--%]
-<h2 class="rdetail_uris">[% l("Related electronic resources") %]</h2>
-<div class="rdetail_uris">
-    [%- IF num_uris > 1 %]<ul>[% END %]
-    [%- FOR uri IN merged_uris %]
-        [%- IF num_uris == 1 -%]
-            <p class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
-        [%- ELSE -%]
-            <li class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
-        [%- END -%]
-        <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
-        <link property="availability" href="http://schema.org/OnlineOnly" />
-        [%- IF attrs.gtin13; '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />'; END; %]
-        [%- IF num_uris == 1 %]</p>[% ELSE %]</li>[% END %]
-    [%- END %]
-    [%- IF num_uris > 1 %]</ul>[% END %]
-</div>
-[%- END %]
-	
 [%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %]
 
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index ec2bee62b4..61a5035ef1 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 %]<br/>
+                                                    [%- 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 %]
                                                         <tr name='bib_cn_list' class='result_table_title_cell'>
                                                             <td valign='top'>
-                                                                <strong>[% l('Call number:') %]</strong>
+                                                                <strong>[% l('Call Number:') %]</strong>
                                                             </td>
-                                                            <td>[% args.holdings.0.label | html %]</td>
+                                                            <td><strong>[% args.holdings.0.label | html %]</strong></td>
                                                         </tr>
                                                            [% END %]
                                                         [% END %]
-- 
2.11.0