From 3d6c2f44cbe9a891b655b584caed5baabe1f4b54 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Wed, 23 May 2018 20:44:57 -0400
Subject: [PATCH] separate out cart from list in actions list

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../src/templates/opac/parts/bookbag_actions.tt2    |  3 ---
 .../src/templates/opac/parts/record/summary.tt2     | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2 b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
index bb342f4b3c..b18a4aeb90 100644
--- a/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
+++ b/Open-ILS/src/templates/opac/parts/bookbag_actions.tt2
@@ -44,9 +44,6 @@
           [% l("Add to my list") %]
         </a>
     <ul>
-    <li class="[% tclass %]">
-    <a href="[% href %]">[% l('Cart') %]</a>
-    </li>
     [% IF default_list;
        label = (ctx.default_bookbag) ? ctx.default_bookbag : l('Default List');
        class = (ctx.bookbags.size) ? "default divider" : "default";
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 97bca31050..ae55d49c93 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -98,30 +98,31 @@
             [%- END -%]
 
             <div class="rdetail_aux_utils toggle_list">
-        [% 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 cart") : l("Remove from cart");
+            [% operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
+                label = (operation == "add") ? l("Add to Cart") : l("Remove from Cart");
             %]
                 <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/add-to-cart.png[% ctx.cache_key %]" alt="" />
                     [% label %]
                 </a>
-            [% END %]
-        [% END %]
             </div>
             <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[% ctx.cache_key %]" alt="[% l('View My Lists') %]" />[% l(' View My Lists') %]</a>
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]" class="no-dec" rel="nofollow" vocab=""><img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" alt="[% l('View Cart') %]" />[% l(' View Cart') %]</a>
                         [%- ELSE %]
                         <a href="[% mkurl(ctx.opac_root _ '/mylist') %]" class="no-dec" rel="nofollow" vocab=""><img src="[% ctx.media_prefix %]/images/add-to-cart.png[% ctx.cache_key %]" alt="[% l('View My Cart') %]" />[% l(' View My Cart') %]</a>
                         [%- END %]
                     [% END %]
                 </div>
+            <div class="rdetail_aux_utils toggle_list">
+        [% IF !ctx.is_staff %]
+            [%  IF ctx.user;
+                INCLUDE "opac/parts/bookbag_actions.tt2";
+                END;
+            %]
+        [% END %]
+            </div>
                 <div class="rdetail_aux_utils">
                     <img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" 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> /
-- 
2.11.0