From b3f414a24743591137b3acc97ad39feaebc9e4ad Mon Sep 17 00:00:00 2001
From: McCanna <tmccanna@georgialibraries.org>
Date: Tue, 7 Nov 2017 15:58:42 -0500
Subject: [PATCH] OPAC Customization: Item Details Page

Upgrade fixes to OPAC item details page - force Novelist content to stay
open, re-show List links in staff client, fix problems with duplicate
holdings tables and column adjustments, fixed e-resource link within the
staff client, removed print/email link.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>
---
 .../src/templates/opac/parts/record/copy_table.tt2 |  4 +-
 .../src/templates/opac/parts/record/extras.tt2     |  2 +-
 .../src/templates/opac/parts/record/summary.tt2    | 59 ++++++++++++----------
 3 files changed, 34 insertions(+), 31 deletions(-)

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 5877bbbbad..d36426ee35 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -51,7 +51,7 @@ END;
             [%- END %]
             <th scope='col' style="text-align:left;vertical-align:top;">[% l("Status") %]</th>
 			[%- IF ctx.is_staff %]
-            <th scope='col'>[% l("Due Date") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Due Date") %]</th>
 			[%- END -%]
         </tr>
     </thead>
@@ -140,7 +140,7 @@ END; # FOREACH bib
                     '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />';
                 END; -%]
             </td>
-            <td property="availableAtOrFrom">[%- INCLUDE "opac/parts/location_name_link.tt2"; -%]</td>
+
             [%- IF ctx.is_staff %]
             <td valign="top" style="background-color:#fff;">
                 [% copy_info.age_protect ?
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index da75116d39..c6c55cb335 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -75,7 +75,7 @@
                     IF tab_is_active(name);
                         href = mkurl('', {}, ['expand', 'ac']);
                         arrow = arrow_down;			    
-					ELSIF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand');
+					ELSIF name == 'awards';
                         href = mkurl('', {}, ['expand', 'ac']);
                         arrow = arrow_down;						    
 					ELSE;
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 49e46beb5d..c4f59e2dbf 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -97,7 +97,32 @@
             [%- END -%]
 
             <div class="rdetail_aux_utils toggle_list">
-        [% IF !ctx.is_staff %]
+        <!-- PINES Customization: Bring back list link even though it doesn't fully work in the staff client -->
+        [% IF ctx.is_staff %]
+            [%  IF ctx.user;
+                INCLUDE "opac/parts/bookbag_actions.tt2";
+            %]
+            [%  ELSE;
+                operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
+                label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
+            %]
+                <a href="[% mkurl(ctx.opac_root _ '/mylist/' _ operation, {record => ctx.bre_id}, stop_parms) %]" class="no-dec" rel="nofollow" vocab="">
+                    <img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" alt="" />
+                    [% label %]
+                </a>
+                <a href="http://pines.georgialibraries.org/catalog-help#my_list" target="_blank">
+                    <img src="[% ctx.media_prefix %]/images/question-mark.png" alt="Learn about lists" border=0></a>
+            [% END %]
+        [% END %]		
+		
+		
+		
+		
+		
+		
+		
+		
+		[% IF !ctx.is_staff %]
             [%  IF ctx.user;
                 INCLUDE "opac/parts/bookbag_actions.tt2";
             %]
@@ -114,7 +139,7 @@
             [% END %]
         [% END %]
             </div>
-            <div class="rdetail_aux_utils toggle_list">
+            <div class="rdetail_aux_utils toggle_list">				 
                      [% IF ctx.mylist.size %]
                         [%- IF ctx.user; %]
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]" class="no-dec" rel="nofollow" vocab=""><img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('View My Lists') %]" />[% l(' View My Lists') %]</a>
@@ -123,11 +148,13 @@
                         [%- END %]
                     [% END %]
                 </div>
+				<!-- Hide Print/Email in PINES for now since it doesn't print anything useful
                 <div class="rdetail_aux_utils">
                     <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('Print / Email Actions Image') %]" />
                     <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Print') %]</a> /
                     <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Email') %]</a>
                 </div>
+				-->
                 [%- IF ctx.refworks.enabled == 'true' %]
                     [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
                 [%- END %]
@@ -183,7 +210,7 @@
 num_uris = merged_uris.size;
 IF num_uris > 0;
 -%]
-<h2 class="rdetail_uris" style="margin-top:50px;" >[% l("Related electronic resources") %]</h2>
+<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 %]
@@ -192,7 +219,7 @@ IF num_uris > 0;
         [%- ELSE -%]
             <li class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
         [%- END -%]
-        <a href="[% uri.href %]" class="uri_link" property="url">
+        <a href="[% uri.href %]" target="_new" class="uri_link" property="url">
         [%- IF uri.href != uri.link;
                 '<span property="description">' _ uri.link _ '</span>';
             ELSE;
@@ -239,30 +266,6 @@ INCLUDE "opac/parts/record/copy_counts.tt2";
         </p>
     </span>
 
-<!-- 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>
 [%- END %]
-- 
2.11.0