[Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,1.1.2.1,1.1.2.2 opac-basket.pl,1.3.2.1,1.3.2.2 opac-detail.pl,1.14.2.2,1.14.2.3 opac-ISBDdetail.pl,1.5.2.2,1.5.2.3 opac-MARCdetail.pl,1.4.2.2,1.4.2.3 opac-readingrecord.pl,1.6,1.6.2.1 opac-reserve.pl,1.22.2.1,1.22.2.2 opac-search.pl,1.21.2.1,1.21.2.2 opac-searchresults.pl,1.16,1.16.2.1 opac-sendbasket.pl,1.4,1.4.2.1 opac-serial-issues.pl,1.1.2.2,1.1.2.3 opac-shelves.pl,1.3.2.3,1.3.2.4 opac-sidebar.pl,1.4,1.4.4.1 opac-suggestions.pl,1.3,1.3.2.1 opac-userdetails.pl,1.8,1.8.2.1 opac-user.pl,1.14.2.1,1.14.2.2 opac-userupdate.pl,1.11,1.11.2.1
Paul POULAIN
tipaul at users.sourceforge.net
Fri Mar 25 18:04:31 CET 2005
Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27093/opac
Modified Files:
Tag: rel_2_2
opac-addbookbybiblionumber.pl opac-basket.pl opac-detail.pl
opac-ISBDdetail.pl opac-MARCdetail.pl opac-readingrecord.pl
opac-reserve.pl opac-search.pl opac-searchresults.pl
opac-sendbasket.pl opac-serial-issues.pl opac-shelves.pl
opac-sidebar.pl opac-suggestions.pl opac-userdetails.pl
opac-user.pl opac-userupdate.pl
Log Message:
adding virtual shelves & suggestions button to the top
Index: opac-addbookbybiblionumber.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-addbookbybiblionumber.pl 10 Mar 2005 08:44:43 -0000 1.1.2.1
--- opac-addbookbybiblionumber.pl 25 Mar 2005 17:04:27 -0000 1.1.2.2
***************
*** 76,79 ****
--- 76,82 ----
author => $biblios[0]->{'author'},
CGIbookshelves => $CGIbookshelves,
+ LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
***************
*** 81,84 ****
--- 84,90 ----
}
# $Log$
+ # Revision 1.1.2.2 2005/03/25 17:04:27 tipaul
+ # adding virtual shelves & suggestions button to the top
+ #
# Revision 1.1.2.1 2005/03/10 08:44:43 tipaul
# bugfix in baskets :
Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-basket.pl 25 Jan 2005 21:39:13 -0000 1.3.2.1
--- opac-basket.pl 25 Mar 2005 17:04:27 -0000 1.3.2.2
***************
*** 35,38 ****
--- 35,39 ----
my $dat = &bibdata($biblionumber);
my ($authorcount, $addauthor) = &addauthor($biblionumber);
+ my @items = &ItemInfo(undef, $biblionumber, 'opac');
$dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 45,55 ****
$num++;
$dat->{'biblionumber'} = $biblionumber;
!
push (@results, $dat);
}
my $resultsarray=\@results;
! $template->param(BIBLIO_RESULTS => $resultsarray);
output_html_with_http_headers $query, $cookie, $template->output;
--- 46,61 ----
$num++;
$dat->{'biblionumber'} = $biblionumber;
! $dat->{ITEM_RESULTS} = \@items;
push (@results, $dat);
}
my $resultsarray=\@results;
+ # my $itemsarray=\@items;
! $template->param(BIBLIO_RESULTS => $resultsarray,
! LibraryName => C4::Context->preference("LibraryName"),
! suggestion => C4::Context->preference("suggestion"),
! virtualshelves => C4::Context->preference("virtualshelves"),
! );
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -r1.14.2.2 -r1.14.2.3
*** opac-detail.pl 3 Feb 2005 15:25:28 -0000 1.14.2.2
--- opac-detail.pl 25 Mar 2005 17:04:27 -0000 1.14.2.3
***************
*** 72,75 ****
--- 72,78 ----
SITE_RESULTS => $sitearray,
subscriptionsnumber => $subscriptionsnumber,
+ LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** opac-ISBDdetail.pl 18 Mar 2005 09:59:19 -0000 1.5.2.2
--- opac-ISBDdetail.pl 25 Mar 2005 17:04:27 -0000 1.5.2.3
***************
*** 79,82 ****
--- 79,86 ----
debug => 1,
});
+ $template->param(LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
+ );
my $ISBD = C4::Context->preference('ISBD');
Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** opac-MARCdetail.pl 10 Mar 2005 15:52:37 -0000 1.4.2.2
--- opac-MARCdetail.pl 25 Mar 2005 17:04:27 -0000 1.4.2.3
***************
*** 79,82 ****
--- 79,86 ----
debug => 1,
});
+ $template->param(LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
+ );
# fill arrays
Index: opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** opac-readingrecord.pl 8 Jan 2004 18:25:31 -0000 1.6
--- opac-readingrecord.pl 25 Mar 2005 17:04:27 -0000 1.6.2.1
***************
*** 52,55 ****
--- 52,57 ----
$template->param(READING_RECORD => $issues,
LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** opac-reserve.pl 10 Feb 2005 13:17:22 -0000 1.22.2.1
--- opac-reserve.pl 25 Mar 2005 17:04:27 -0000 1.22.2.2
***************
*** 171,174 ****
--- 171,176 ----
$template->param(totalwidth => 2*$width-1,
LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** opac-search.pl 7 Mar 2005 09:49:09 -0000 1.21.2.1
--- opac-search.pl 25 Mar 2005 17:04:28 -0000 1.21.2.2
***************
*** 71,75 ****
\@excluding, \@operator, \@value,
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
!
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-searchresults.tmpl",
--- 71,84 ----
\@excluding, \@operator, \@value,
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
! if ($total ==1) {
! if (C4::Context->preference("BiblioDefaultView") eq "normal") {
! print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
! } elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
! print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
! } else {
! print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
! }
! exit;
! }
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-searchresults.tmpl",
***************
*** 142,145 ****
--- 151,156 ----
searchdesc=> $searchdesc,
$defaultview => 1,
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
***************
*** 191,194 ****
--- 202,207 ----
CGIitemtype => $CGIitemtype,
CGIbranch => $CGIbranch,
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
}
Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-searchresults.pl 10 May 2004 09:25:24 -0000 1.16
--- opac-searchresults.pl 25 Mar 2005 17:04:28 -0000 1.16.2.1
***************
*** 124,127 ****
--- 124,129 ----
$template->param(numbers => $numbers,
LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** opac-sendbasket.pl 7 Dec 2004 10:10:41 -0000 1.4
--- opac-sendbasket.pl 25 Mar 2005 17:04:28 -0000 1.4.2.1
***************
*** 42,46 ****
my @bibs = split(/\//, $bib_list);
my @results;
!
foreach my $biblionumber (@bibs) {
$template2->param(biblionumber => $biblionumber);
--- 42,46 ----
my @bibs = split(/\//, $bib_list);
my @results;
! my $iso2709;
foreach my $biblionumber (@bibs) {
$template2->param(biblionumber => $biblionumber);
***************
*** 48,51 ****
--- 48,52 ----
my $dat = &bibdata($biblionumber);
my ($authorcount, $addauthor) = &addauthor($biblionumber);
+ my @items = &ItemInfo(undef, $biblionumber, 'opac');
$dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 55,59 ****
$dat->{'biblionumber'} = $biblionumber;
!
push (@results, $dat);
}
--- 56,63 ----
$dat->{'biblionumber'} = $biblionumber;
! $dat->{ITEM_RESULTS} = \@items;
! my $record = MARCgetbiblio($dbh,$bibid);
! $iso2709 .= $record->as_usmarc();
!
push (@results, $dat);
}
***************
*** 98,101 ****
--- 102,106 ----
END_OF_BODY
+ $mail{PJ} = $iso2709;
# $mail{body} = <<END_OF_BODY;
#$boundary
***************
*** 130,134 ****
else {
$template->param(bib_list => $bib_list);
! $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl");
output_html_with_http_headers $query, $cookie, $template->output;
}
--- 135,142 ----
else {
$template->param(bib_list => $bib_list);
! $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! suggestion => C4::Context->preference("suggestion"),
! virtualshelves => C4::Context->preference("virtualshelves"),
! );
output_html_with_http_headers $query, $cookie, $template->output;
}
Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-serial-issues.pl 24 Jan 2005 21:59:12 -0000 1.1.2.2
--- opac-serial-issues.pl 25 Mar 2005 17:04:28 -0000 1.1.2.3
***************
*** 35,57 ****
biblionumber => $query->param('biblionumber'),
subscription_LOOP => $subscriptions
! # startdate => format_date($subscription->{startdate}),
! # periodicity => $subscription->{periodicity},
! # dow => $subscription->{dow},
! # numberlength => $subscription->{numberlength},
! # weeklength => $subscription->{weeklength},
! # monthlength => $subscription->{monthlength},
! # opacnote => $subscription->{opacnote},
! # numberingmethod => $subscription->{numberingmethod},
! # arrivalplanified => $subscription->{arrivalplanified},
! # status => $subscription->{status},
! # biblionumber => $subscription->{biblionumber},
! # bibliotitle => $subscription->{bibliotitle},
! # notes => $subscription->{notes},
! # subscriptionid => $subscription->{subscriptionid}
);
- # $template->param(
- # "periodicity$subscription->{periodicity}" => 1,
- # "arrival$subscription->{dow}" => 1,
- # );
output_html_with_http_headers $query, $cookie, $template->output;
--- 35,41 ----
biblionumber => $query->param('biblionumber'),
subscription_LOOP => $subscriptions
! suggestion => C4::Context->preference("suggestion"),
! virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** opac-shelves.pl 27 Jan 2005 17:18:28 -0000 1.3.2.3
--- opac-shelves.pl 25 Mar 2005 17:04:28 -0000 1.3.2.4
***************
*** 59,62 ****
--- 59,64 ----
$template->param({ loggedinuser => $loggedinuser,
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
});
SWITCH: {
***************
*** 185,188 ****
--- 187,193 ----
#
# $Log$
+ # Revision 1.3.2.4 2005/03/25 17:04:28 tipaul
+ # adding virtual shelves & suggestions button to the top
+ #
# Revision 1.3.2.3 2005/01/27 17:18:28 oleonard
# Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
Index: opac-sidebar.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** opac-sidebar.pl 2 Feb 2003 07:18:38 -0000 1.4
--- opac-sidebar.pl 25 Mar 2005 17:04:28 -0000 1.4.4.1
***************
*** 27,31 ****
my $self_url = $query->url(-absolute => 1);
! $template->param(url => $self_url);
output_html_with_http_headers $query, $cookie, $template->output;
--- 27,34 ----
my $self_url = $query->url(-absolute => 1);
! $template->param(url => $self_url,
! suggestion => C4::Context->preference("suggestion"),
! virtualshelves => C4::Context->preference("virtualshelves"),
! );
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-suggestions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-suggestions.pl 12 Aug 2004 14:50:29 -0000 1.3
--- opac-suggestions.pl 25 Mar 2005 17:04:28 -0000 1.3.2.1
***************
*** 62,65 ****
--- 62,67 ----
suggestedbyme => $suggestedbyme,
"op_$op" => 1,
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** opac-userdetails.pl 13 Jul 2004 20:16:22 -0000 1.8
--- opac-userdetails.pl 25 Mar 2005 17:04:28 -0000 1.8.2.1
***************
*** 33,36 ****
--- 33,38 ----
$template->param($borr);
$template->param(LibraryName => C4::Context->preference("LibraryName")
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** opac-user.pl 28 Jan 2005 19:34:15 -0000 1.14.2.1
--- opac-user.pl 25 Mar 2005 17:04:28 -0000 1.14.2.2
***************
*** 138,141 ****
--- 138,143 ----
$template->param(waiting_count => $wcount,
LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** opac-userupdate.pl 8 Jan 2004 18:28:48 -0000 1.11
--- opac-userupdate.pl 25 Mar 2005 17:04:28 -0000 1.11.2.1
***************
*** 90,93 ****
--- 90,95 ----
$template->param(BORROWER_INFO => \@bordat,
LibraryName => C4::Context->preference("LibraryName"),
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
);
More information about the Koha-cvs
mailing list