diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index cfa4f60c00..7cab246242 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -68,6 +68,14 @@ sub shelfpage ($$$$$) {
my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
my $marcflavour = C4::Context->preference("marcflavour");
+ # get biblionumbers stored in the cart
+ my @cart_list;
+ my $cart_cookie = ( $type eq 'opac' ? "bib_list" : "intranet_bib_list" );
+ if($query->cookie($cart_cookie)){
+ my $cart_list = $query->cookie($cart_cookie);
+ @cart_list = split(/\//, $cart_list);
+ }
+
$shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') );
$shelflimit = $shelflimit || 20;
$shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at
@@ -227,6 +235,9 @@ sub shelfpage ($$$$$) {
my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'});
$this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} );
$this_item->{'ITEM_RESULTS'} = \@items_infos;
+ if ( grep {$_ eq $biblionumber} @cart_list) {
+ $this_item->{'incart'} = 1;
+ }
if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) {
$this_item->{'TagLoop'} = get_tags({
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index f904af2442..f2b146781e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -453,6 +453,18 @@ a .term {
background-image:url(../../images/cart2.gif);
}
+#action a.cartRemove, .actions a.cartRemove {
+ color: #cc3333;
+ font-size : 90%;
+ margin : 0;
+ padding: 0;
+}
+
+#action a.incart {
+ background-image:url(../../images/cart2.gif);
+ color : #666;
+}
+
/* toolbar buttons */
#toolbar {
@@ -1296,6 +1308,9 @@ padding-left : .4em;
color: #707070;
padding : 0 0 .5em 0;
}
+.results_summary .results_summary {
+ font-size : 100%;
+}
.m880 {
display:block;
@@ -1498,6 +1513,7 @@ div.lang{
box-shadow: 1px 1px 3px #666;
-moz-box-shadow: 1px 1px 3px #666;
-webkit-box-shadow: 1px 1px 3px #666;
+ z-index: 2;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 18e591728e..3907f3466c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -48,12 +48,15 @@
[% IF ( opacbookbag ) %]var MSG_BASKET_EMPTY = _("Your cart is currently empty");
var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
var MSG_RECORD_ADDED = _("This item has been added to your cart");
+ var MSG_RECORD_REMOVED = _("This item has been removed from your cart");
var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");
var MSG_NRECORDS_IN_BASKET = _("already in your cart");
var MSG_NO_RECORD_SELECTED = _("No item was selected");
var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
+ var MSG_ITEM_IN_CART = _("In your cart");
+ var MSG_ITEM_NOT_IN_CART = _("Add to your cart");
$("#cartDetails").ready(function(){ $("#cmspan").html("|
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index 07216a7532..7d9d4d2fde 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -320,8 +320,13 @@ $(function() {
[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]Save to another list
[% END %][% END %][% END %]
-
- [% IF ( opacbookbag ) %]Add to Cart[% ELSE %]nocart[% END %]
+ [% IF ( opacbookbag ) %]
+ [% IF ( itemsloo.incart ) %]
+ In your cart (remove)
+ [% ELSE %]
+ Add to Cart (remove)
+ [% END %]
+ [% END %]
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 7150401021..634dd859c4 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -69,6 +69,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my $biblionumber = $query->param('biblionumber');
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("bib_list")){
+ my $cart_list = $query->cookie("bib_list");
+ @cart_list = split(/\//, $cart_list);
+ if ( grep {$_ eq $biblionumber} @cart_list) {
+ $template->param( incart => 1 );
+ }
+}
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 695e4add96..2d9dc25241 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -81,6 +81,17 @@ $template->param(
bibliotitle => $biblio->{title},
);
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("bib_list")){
+ my $cart_list = $query->cookie("bib_list");
+ @cart_list = split(/\//, $cart_list);
+ if ( grep {$_ eq $biblionumber} @cart_list) {
+ $template->param( incart => 1 );
+ }
+}
+
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 6073d34fe7..27684d4812 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -75,6 +75,17 @@ if ( ! $record ) {
}
$template->param( biblionumber => $biblionumber );
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("bib_list")){
+ my $cart_list = $query->cookie("bib_list");
+ @cart_list = split(/\//, $cart_list);
+ if ( grep {$_ eq $biblionumber} @cart_list) {
+ $template->param( incart => 1 );
+ }
+}
+
SetUTF8Flag($record);
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 87d2890092..3e3995df22 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -88,6 +88,14 @@ if ($template_name eq 'opac-results.tmpl') {
$template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults'));
}
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($cgi->cookie("bib_list")){
+ my $cart_list = $cgi->cookie("bib_list");
+ @cart_list = split(/\//, $cart_list);
+}
+
if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') {
$template->param($format => 1);
$template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom');
@@ -497,6 +505,10 @@ for (my $i=0;$i<@servers;$i++) {
# in order to avoid problems generated by the default size value in TT
foreach my $line (@newresults) {
if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
+ # while we're checking each line, see if item is in the cart
+ if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
+ $line->{'incart'} = 1;
+ }
}
my $tag_quantity;
|