From 9f378f7edad9a740c8cb8ff326212af9c0aa5ae9 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 12 Jun 2012 16:32:36 -0400
Subject: [PATCH] kcls / tpac 2.2 : list UI repairs

Updated basic display elements to match community version.  In
particular, show list contents for selected list only.  Also merge in
change from "id" to "bbid" for bookbag CGI passing.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates_kcls/opac/myopac/lists.tt2 | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates_kcls/opac/myopac/lists.tt2 b/Open-ILS/src/templates_kcls/opac/myopac/lists.tt2
index 32299a12fb..f932eef0f2 100644
--- a/Open-ILS/src/templates_kcls/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates_kcls/opac/myopac/lists.tt2
@@ -78,12 +78,15 @@
                 </form>
                 <div class="bookbag-controls">
                     <big><strong>
-                    [% IF bbag.pub == 't' %]
-                        [% url = 'http://' _ ctx.hostname _ '/opac/extras/feed/bookbag/html-full/' _ bbag.id %]
-                        <a target='_blank' href='[% url %]'>[% bbag.name | html %]</a>
-                    [% ELSE %]
-                    [% bbag.name | html %]
-                    [% END %]
+                    [% baseurl = ctx.opac_root _ '/myopac/lists';
+                    IF bbag.id != CGI.param("bbid");
+                        url = mkurl(baseurl, {bbid => bbag.id}, ['edit_notes','sort']);
+                        ltitle = l("Show items in list");
+                    ELSE;
+                        url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']);
+                        ltitle = l("Hide items in list");
+                    END %]
+                    <a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a></h2>
                     </strong></big>
                 </div>
                 <div class="bookbag-controls">
@@ -93,10 +96,13 @@
                         src="[% ctx.media_prefix %]/images/small-rss.png"/></a>
                     [% END %]
                 </div>
-                <div class="clear-both pad-bottom-five"></div>
+                <div class="clear-both _pad-bottom-five"></div>
             </div>
+
             <form action="[% ctx.opac_root %]/myopac/list/update" method="POST">
             <input type="hidden" name="list" value="[% bbag.id %]" />
+
+            [% IF CGI.param("bbid") == bbag.id %]
             <table cellpadding='0' cellspacing='0' border='0'>
                 <thead id="acct_list_header">
                     <tr>
@@ -127,7 +133,7 @@
                     </td></tr>
                     [% END %]
                     [% FOR item IN bbag.items;
-                        rec_id = item.target_biblio_record_entry;
+                        rec_id = item.target_biblio_record_entry.id;
                         attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id};
                         PROCESS get_marc_attrs args=attrs %]
                     <tr>
@@ -147,8 +153,10 @@
                     [% END %]
                 </tbody>
             </table>
+            <br />
+            [% END %] <!-- specific bookbag contents -->
             </form>
-            <br /><br />
+
         </div>
         [% END %]
     </div>
-- 
2.11.0