From 1578ab14c6de9303a91a055e3906f40f8edde62e Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 14 Dec 2015 11:57:35 -0500
Subject: [PATCH] Improvements to KPAC list display, especially adding display
 of list annotations that were not shown.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/kpac/parts/record_row.tt2 | 44 ++++++++++++++++++++----
 Open-ILS/src/templates/kpac/results.tt2          | 10 ++++--
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates/kpac/parts/record_row.tt2 b/Open-ILS/src/templates/kpac/parts/record_row.tt2
index 38c39adb7f..dbee1ca855 100644
--- a/Open-ILS/src/templates/kpac/parts/record_row.tt2
+++ b/Open-ILS/src/templates/kpac/parts/record_row.tt2
@@ -18,6 +18,43 @@
             [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] <!-- TODO fix commas, etc. -->
             [% IF attrs.phys_desc %]<br/>[% attrs.phys_desc | html; END %]
         </div>
+		<!-- added list annotations -->
+					[% IF ctx.bookbag;
+                        rec_id = rec.id;
+                        FOR note IN ctx.bookbag_items_by_bre_id.$rec_id.notes %]
+                        <div class="item_detail_extra_info" style="font-style:italic;margin-top:5px;">
+                            Note: [% note.note | html %]
+                        </div>
+                        [% END %]
+                    [% END %]
+		<!-- end list annotations -->
+        [%- IF attrs.format_label %]
+            [% FOR format IN attrs.all_formats %]
+			<div class="item_icon_wrapper">
+				<div class="item_icon">
+				    <img title="[% format.label | html %]" 
+                    alt="[% format.label | html %]" 
+                    src="[% format.icon %]" /><br/>
+                    [% format.label | html %]
+				</div>
+			</div>
+            [% END %]
+			<!-- link to add to b4 book log -->
+			<div class="item_icon_wrapper">
+				<div class="item_icon">
+					<script type="text/javascript">
+						var a = escape("[% attrs.title %]");
+						var b = escape("[% attrs.author %]");
+						var b4link = "http://b4.georgialibraries.org/cat_add.php?title=" + a + "&author=" + b;
+						document.write("<a href='" + b4link + "'>");
+					</script>
+					<img src="[% ctx.media_prefix %]/images/kpac/b4only.png" alt="Add to B4 Book Log" /><br/>
+					Add to B4<br/>Book Log</a>
+				</div>  
+			</div>	
+		    <div class="clear">&nbsp;</div>
+	    [% END %]
+	
         [% IF show_actions %]
         <div class="item_detail_actions">
             <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/record/' _ rec_id) %]"><img 
@@ -28,13 +65,6 @@
         </div>
         [% END %]
     </div>
-    <div class="item_icon_wrapper">
-        <div class="item_icon">
-            &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp; 
-            <!-- put a single &nbsp; around each side of the image - for vertical centering -->
-        </div>
-        <div class="item_icon_type_text">[% attrs.format_label %]</div>
-    </div>
     <div class="clear">&nbsp;</div>
 </div>
 
diff --git a/Open-ILS/src/templates/kpac/results.tt2 b/Open-ILS/src/templates/kpac/results.tt2
index 9a0b0d5281..2ecb7cd536 100644
--- a/Open-ILS/src/templates/kpac/results.tt2
+++ b/Open-ILS/src/templates/kpac/results.tt2
@@ -4,7 +4,13 @@
     WRAPPER "kpac/parts/subpage.tt2";
     ctx.page_title = l('Search Results') %]
         
-<h2 class="sub_header2">[% l('Search Results') %]</h2>
+[% IF ctx.bookbag %]
+    <h2 class="sub_header2">[% ctx.bookbag.name | html %]</h2>
+    <div style="font-weight:normal;font-size:1.5em;text-align:left;padding:10px;">[% ctx.bookbag.description | html %]</div>
+[% ELSE %]
+	<h2 class="sub_header2">[% l('Search Results') %]</h2>
+[% END %]
+
 
 [% IF ctx.records.size == 0 %]
 
@@ -17,7 +23,7 @@
 
     <div class="sub_navigation2">
         [% INCLUDE 'kpac/parts/paginate.tt2' %]
-    </div>
+	</div>
 
     <div id="search_results_parent"> [%
         FOR rec IN ctx.records;
-- 
2.11.0