[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Biblio.pm C4/Reserves2.pm C4/Search.pm ... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha C4/Biblio.pm C4/Reserves2.pm C4/Search.pm ... [rel_3_0] |
|
Date: |
Thu, 07 Dec 2006 15:42:16 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/07 15:42:15
Modified files:
C4 : Biblio.pm Reserves2.pm Search.pm
catalogue : search.pl
koha-tmpl/intranet-tmpl/prog/en/catalogue: detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: menus.inc
koha-tmpl/opac-tmpl/prog/en/includes: basket.js
doc-head-close-basket.inc
doc-head-close-basket-print.inc
doc-head-close.inc
masthead.inc
navigation.inc
opac-bottom.inc opac.css
usermenu.inc
koha-tmpl/opac-tmpl/prog/en: opac-account.tmpl
opac-advsearch.tmpl
opac-authorities-home.tmpl
opac-basket.tmpl opac-detail.tmpl
opac-full-serial-issues.tmpl
opac-ISBDdetail.tmpl opac-main.tmpl
opac-MARCdetail.tmpl
opac-passwd.tmpl
opac-readingrecord.tmpl
opac-reserve.tmpl opac-results.tmpl
opac-shelves.tmpl
opac-suggestions.tmpl
opac-userdetails.tmpl
opac-user.tmpl opac-userupdate.tmpl
opac : changelanguage.pl opac-account.pl
opac-addbookbybiblionumber.pl
opac-alert-subscribe.pl
opac-authoritiesdetail.pl
opac-authorities-home.pl opac-basket.pl
opac-detail.pl opac-detailprint.pl
opac-dictionary.pl opac-ISBDdetail.pl
opac-logout.pl opac-main.pl opac-MARCdetail.pl
opac-passwd.pl opac-readingrecord.pl
opac-renew.pl opac-reserve.pl opac-search.pl
opac-sendbasket.pl opac-serial-issues.pl
opac-shelves.pl opac-showreviews.pl
opac-suggestions.pl opac-userdetails.pl
opac-user.pl opac-userupdate.pl
Removed files:
koha-tmpl/opac-tmpl/prog/en: opac-searchresults.tmpl
opac-search.tmpl
Log message:
synching opac & intranet.
fix some broken link & bugs.
removing warn compilation.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.37&r2=1.178.2.38
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.9&r2=1.46.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.35&r2=1.120.2.36
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.14&r2=1.2.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.20&r2=1.6.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/opac/changelanguage.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-account.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.1&r2=1.11.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-addbookbybiblionumber.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-alert-subscribe.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authoritiesdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.2&r2=1.1.4.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-basket.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.5&r2=1.32.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detailprint.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-dictionary.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16.2.3&r2=1.16.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-logout.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.2&r2=1.23.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.3&r2=1.14.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-passwd.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-readingrecord.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10&r2=1.10.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-renew.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.8.1&r2=1.3.8.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29.2.5&r2=1.29.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.5&r2=1.38.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-sendbasket.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10.2.4&r2=1.10.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-serial-issues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8&r2=1.8.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.3&r2=1.8.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-showreviews.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-suggestions.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6&r2=1.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userdetails.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.1&r2=1.12.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.1&r2=1.23.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userupdate.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14&r2=1.14.2.1
Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.37
retrieving revision 1.178.2.38
diff -u -b -r1.178.2.37 -r1.178.2.38
--- C4/Biblio.pm 7 Dec 2006 11:09:39 -0000 1.178.2.37
+++ C4/Biblio.pm 7 Dec 2006 15:42:14 -0000 1.178.2.38
@@ -33,7 +33,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.178.2.37 $' =~ /\d+/g;
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.178.2.38 $' =~ /\d+/g;
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
@ISA = qw( Exporter );
@@ -655,7 +655,6 @@
$datedue = format_date( $idata->{'date_due'} );
}
if ( $datedue eq '' ) {
-
#$datedue="Available";
my ( $restype, $reserves ) =
C4::Reserves2::CheckReserves( $data->{'itemnumber'} );
@@ -722,7 +721,6 @@
"
);
$stackstatus->execute( $authorised_valuecode, $data->{stack} );
-
my ($lib) = $stackstatus->fetchrow;
$data->{stack} = $lib;
}
@@ -1545,7 +1543,6 @@
my $label = "su:";
my $flag = 0;
for my $subject_subfield ( @subfields ) {
- warn Data::Dumper::Dumper($subject_subfield);
my $code = $subject_subfield->[0];
$label .= $subject_subfield->[1] . " and su-to:" unless ( $code ==
9 );
if ( $code == 9 ) {
@@ -3571,8 +3568,13 @@
=cut
-# $Id: Biblio.pm,v 1.178.2.37 2006/12/07 11:09:39 tipaul Exp $
+# $Id: Biblio.pm,v 1.178.2.38 2006/12/07 15:42:14 toins Exp $
# $Log: Biblio.pm,v $
+# Revision 1.178.2.38 2006/12/07 15:42:14 toins
+# synching opac & intranet.
+# fix some broken link & bugs.
+# removing warn compilation.
+#
# Revision 1.178.2.37 2006/12/07 11:09:39 tipaul
# MAJOR FIX :
# the ->destroy() line destroys the zebra connection. When we are running koha
as cgi, it's not a problem, as the script dies after each request.
Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.9
retrieving revision 1.46.2.10
diff -u -b -r1.46.2.9 -r1.46.2.10
--- C4/Reserves2.pm 5 Dec 2006 14:39:55 -0000 1.46.2.9
+++ C4/Reserves2.pm 7 Dec 2006 15:42:14 -0000 1.46.2.10
@@ -20,7 +20,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Reserves2.pm,v 1.46.2.9 2006/12/05 14:39:55 alaurin Exp $
+# $Id: Reserves2.pm,v 1.46.2.10 2006/12/07 15:42:14 toins Exp $
use strict;
require Exporter;
@@ -32,7 +32,7 @@
my $library_name = C4::Context->preference("LibraryName");
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.9 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.10 $' =~ /\d+/g; shift(@v) . "." .
join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -513,20 +513,18 @@
my $sth;
if ($item) {
my $qitem = $dbh->quote($item);
-
# Look up the item by itemnumber
- my $query = qq/
+ my $query = qq(
SELECT items.biblionumber, items.biblioitemnumber,
itemtypes.notforloan
FROM items, biblioitems, itemtypes
WHERE items.biblioitemnumber = biblioitems.biblioitemnumber
AND biblioitems.itemtype = itemtypes.itemtype
AND itemnumber=$qitem
- /;
+ );
$sth = $dbh->prepare($query);
}
else {
my $qbc = $dbh->quote($barcode);
-
# Look up the item by barcode
my $query = qq(
SELECT items.biblionumber, items.biblioitemnumber,
itemtypes.notforloan
@@ -559,16 +557,13 @@
my $highest;
if ($count) {
foreach my $res (@reserves) {
-
# FIXME - $item might be undefined or empty: the caller
# might be searching by barcode.
if ( $res->{'itemnumber'} == $item ) {
-
# Found it
return ( "Waiting", $res );
}
else {
-
# See if this item is more important than what we've got
# so far.
if ( $res->{'priority'} != 0 && $res->{'priority'} < $priority
)
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.35
retrieving revision 1.120.2.36
diff -u -b -r1.120.2.35 -r1.120.2.36
--- C4/Search.pm 5 Dec 2006 15:07:16 -0000 1.120.2.35
+++ C4/Search.pm 7 Dec 2006 15:42:14 -0000 1.120.2.36
@@ -25,7 +25,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.35 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.36 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -326,9 +326,7 @@
my $size = $results[ $i - 1 ]->size();
if ( $size > 0 ) {
my $results_hash;
-
#$results_hash->{'server'} = $servers[$i-1];
-
# loop through the results
$results_hash->{'hits'} = $size;
my $times;
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- catalogue/search.pl 17 Nov 2006 11:17:30 -0000 1.1.2.7
+++ catalogue/search.pl 7 Dec 2006 15:42:14 -0000 1.1.2.8
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.7 2006/11/17
11:17:30 tipaul Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.8 2006/12/07
15:42:14 toins Exp $
#
# Copyright 2006 LibLime
#
@@ -279,7 +279,7 @@
push @search_boxes_array,
{indexes => $this_index,
search_boxes_label => "<span
class='labels'>Search for:</span>",
- scan_index => "<label for='scan'></label><input
type='checkbox' name='scan' id='scan' value='1'/>Scan Indexes",
+ scan_index => "<input type='checkbox' name='scan' id='scan'
value='1'/><label for='scan'>Scan Indexes</label>",
};
}
@@ -295,6 +295,7 @@
left_content => " <select name='op'><option
value='and' selected='selected'>and</option><option
value='or'>or</option><option value='not'>not</option></select>",};
}
}
+ warn "@search_boxes_array =>" . Data::Dumper::Dumper(@search_boxes_array);
$template->param(uc(C4::Context->preference("marcflavour")) => 1,
search_boxes_loop => address@hidden);
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl,v
retrieving revision 1.2.2.14
retrieving revision 1.2.2.15
diff -u -b -r1.2.2.14 -r1.2.2.15
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 6 Dec 2006
09:14:25 -0000 1.2.2.14
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 7 Dec 2006
15:42:14 -0000 1.2.2.15
@@ -77,7 +77,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->
<p><label><b>Published by :</b></label>
- <a href="/cgi-bin/koha/catalogue/search.pl?q=pu:<!-- TMPL_VAR
NAME="publishercode"">
+ <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR
NAME="publishercode"">
<!-- TMPL_VAR NAME="publishercode" -->
</a>
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6.2.20
retrieving revision 1.6.2.21
diff -u -b -r1.6.2.20 -r1.6.2.21
Index: koha-tmpl/opac-tmpl/prog/en/includes/basket.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/includes/basket.js 3 Mar 2006 20:10:26
-0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/basket.js 7 Dec 2006 15:42:15
-0000 1.1.2.1
@@ -66,7 +66,6 @@
parent.opener.document.cookie = name + "=null; expires=" +
exp.toGMTString();
}
-
///////////////////////////////////////////////////////////////////
// SPECIFIC FUNCTIONS USING COOKIES //
///////////////////////////////////////////////////////////////////
@@ -75,14 +74,14 @@
var strCookie = "";
var nameCookie = "bib_list";
var valCookie = readCookie(nameCookie);
- if (valCookie) {
+ if ( valCookie ) {
strCookie = nameCookie + "=" + valCookie;
}
- if (strCookie) {
- var iW = 620;
+ if ( strCookie ) {
+ var iW = 820;
var iH = 450;
- var optWin =
"dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=yes,height="+iH+",width="+iW;
+ var optWin =
"dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,adressbar=no,height="+iH+",width="+iW;
var loc = CGIBIN + "opac-basket.pl?" + strCookie;
var basket = open(loc, "basket", optWin);
if (window.focus) {basket.focus()}
@@ -92,7 +91,6 @@
}
}
-
function addRecord(val, selection) {
var nameCookie = "bib_list";
var valCookie = readCookie(nameCookie);
@@ -107,14 +105,12 @@
// is this record already in the basket ?
var found = false;
var arrayRecords = valCookie.split("/");
-
for (var i = 0; i < valCookie.length - 1; i++) {
if (val == arrayRecords[i]) {
found = true;
break;
}
}
-
if ( found ) {
if (selection) {
return 0;
Index: koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc 3 Mar
2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc 7 Dec
2006 15:42:15 -0000 1.1.2.1
@@ -2,23 +2,20 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang"
-->/includes/favicon.ico" type="image/x-icon" />
- <!-- TMPL_IF name="opacstylesheet" -->
+
<style type="text/css">
@import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
</style>
- <!-- TMPL_ELSE -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang"
-->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
-<style type="text/css">
- @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR
NAME="opaclayoutstylesheet" -->);
-</style>
- <!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/script.js"></script>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/basket.js"></script>
- <script type="text/javascript" language="javascript">
+
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/script.js" ></script>
+
+<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/basket.js" ></script>
+
+<script type="text/javascript" language="javascript">
var MSG_NO_RECORD_SELECTED = "No biblio selected";
var MSG_NO_RECORD_ADDED = "No biblio added";
var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty
your book bag?"
var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove
the selected items?";
- </script>
+</script>
</head>
<body>
\ No newline at end of file
Index: koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
3 Mar 2006 20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
7 Dec 2006 15:42:15 -0000 1.1.2.1
@@ -5,13 +5,17 @@
<style type="text/css">
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/print.css);
</style>
+
<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/script.js"></script>
+
<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR
NAME="themelang" -->/includes/basket.js"></script>
+
<script type="text/javascript" language="javascript">
var MSG_NO_RECORD_SELECTED = "No biblio selected";
var MSG_NO_RECORD_ADDED = "No biblio added";
var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty
your book bag?"
var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove
the selected items?";
</script>
+
</head>
<body onload="print();">
\ No newline at end of file
Index: koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc 30 Oct 2006
10:09:54 -0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc 7 Dec 2006
15:42:15 -0000 1.1.2.2
@@ -1,6 +1,5 @@
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
<!-- TMPL_IF name="opacstylesheet" -->
<style type="text/css">
@import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
@@ -15,12 +14,17 @@
@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR
NAME="opaclayoutstylesheet" -->);
</style>
<!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/main.js"></script>
+
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR
NAME="themelang" -->/includes/main.js" ></script>
+
<!-- TMPL_IF NAME="AmazonContent" -->
-<script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/amazonimages.js"></script>
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR
NAME="themelang" -->/includes/amazonimages.js" ></script>
<!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/script.js"></script>
-<script type="text/javascript" language="javascript" src="<TMPL_VAR
NAME="themelang">/includes/basket.js"></script>
+
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR
NAME="themelang" -->/includes/script.js" ></script>
+
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR
NAME="themelang" -->/includes/basket.js" ></script>
+
<script type="text/javascript" language="javascript">
var MSG_BASKET_EMPTY = "You book bag is currently empty";
var MSG_RECORD_IN_BASKET = "This item is already in your book bag";
@@ -30,5 +34,6 @@
var MSG_NO_RECORD_SELECTED = "No item was selected";
var MSG_NO_RECORD_ADDED = "No item was added to your book bag";
</script>
+
</head>
<body>
Index: koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc 30 Oct 2006 10:10:18
-0000 1.2.2.3
+++ koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc 7 Dec 2006 15:42:15
-0000 1.2.2.4
@@ -1,21 +1,8 @@
<div id="masthead">
- <h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR
NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!--
/TMPL_IF --><!-- TMPL_VAR NAME="LibraryName" --> Catalog Search</h1>
- <div id="menu">
- <ul>
- <!-- TMPL_VAR NAME="OpacNav" -->
- <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
- <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
- <li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authorities
Headings</a></li>
- <li><a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket();
return false;" title="A "shopping cart" for your selections">Book
Bag<span id="basket"><script language="javascript"
type="text/javascript">if(basketcount){ document.write(basketcount)
};</script></span></a></li>
- <!-- TMPL_IF NAME="loggedinusername" -->
- <!-- TMPL_IF name="virtualshelves" -->
- <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual
shelves</a></li>
+ <h1>
+ <!-- TMPL_IF NAME="opacsmallimage" -->
+ <img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR
NAME="opacsmallimage" -->" />
<!-- /TMPL_IF -->
- <!-- TMPL_IF name="suggestion" -->
- <li><a href="opac-suggestions.pl">Suggestions</a></li>
- <!-- /TMPL_IF -->
- <li><a href="/cgi-bin/koha/opac-main.pl?logout.x=1"
title="Logged in as <!-- TMPL_VAR NAME="loggedinusername" -->">Log Out</a>
- <!-- /TMPL_IF -->
- </ul>
- </div>
+ <!-- TMPL_VAR NAME="LibraryName" -->
+ </h1>
</div>
Index: koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc 30 Oct 2006 10:10:46
-0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc 7 Dec 2006 15:42:15
-0000 1.1.2.2
@@ -1 +1,49 @@
+<div id="menu">
+ <ul>
+ <!-- TMPL_VAR NAME="OpacNav" -->
+ <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
+ <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
+ <li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authorities
Headings</a></li>
+ <li>
+ <a href="#" onclick="javascript:openBasket();" title="A
"shopping cart" for your selections">Book Bag<span id="basket">
+ <script language="javascript" type="text/javascript">
+ if(basketcount){ document.write(basketcount) };
+ </script></span>
+ </a>
+ </li>
+ <!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- TMPL_IF name="virtualshelves" -->
+ <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual
shelves</a></li>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="suggestion" -->
+ <li><a href="opac-suggestions.pl">Suggestions</a></li>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </ul>
+ <br />
+ <!-- TMPL_IF NAME="loggedinusername" -->
+ <b>User Info</b>:
+ <ul>
+ <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" -->
</b></li>
+ <li><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log
Out</a></li>
+ </ul>
+ <!-- TMPL_ELSE -->
+ <ul>
+ <form action="/cgi-bin/koha/opac-user.pl" method="POST" name="auth"
id="auth">
+ <p>
+ <label for="userid">Login:</label>
+ <input type="text" id="userid" size="10" name="userid" />
+ </p>
+ <p>
+ <label for="password">Pass: </label>
+ <input type="password" id="password" size="10" name="password"
/>
+ </p>
+ <p>
+ <input type="submit" value="Log In" class="submit" />
+ </p>
+ </form>
+ </ul>
+ <!-- /TMPL_IF -->
+ </div>
+ <div id="main"> <!-- MAIN Body start here -->
Index: koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc 3 Mar 2006
20:10:26 -0000 1.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc 7 Dec 2006
15:42:15 -0000 1.1.2.1
@@ -1,3 +1,10 @@
-<!-- TMPL_IF NAME="opaccredits" --><div id="footer"><!-- TMPL_VAR
NAME="opaccredits" --></div><!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_IF NAME="opaccredits" -->
+ <div id="footer">
+ <!-- TMPL_VAR NAME="opaccredits" -->
+ </div>
+<!-- /TMPL_IF -->
+
</body>
</html>
Index: koha-tmpl/opac-tmpl/prog/en/includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/includes/opac.css 30 Oct 2006 10:14:04
-0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac.css 7 Dec 2006 15:42:15
-0000 1.1.2.2
@@ -33,13 +33,17 @@
text-align : right;
}
-input[type=submit], input[type=button], input[type=reset]{
+input[type=submit], input[type=button], input[type=reset] {
background-color : #6699cc;
color : #FFFFFF;
font-size : 1em;
font-weight : bold;
}
+.searchresults table tr:hover {
+ background-color: #CCFFFF;
+}
+
tr.highlight td, tr.highlight th {
background-color : #EEEEEE;
}
@@ -49,6 +53,10 @@
background-color:yellow;
}
+.here {
+ color: black;
+ text-decoration:none;
+}
#main {
margin-left:15%;
@@ -56,7 +64,9 @@
#menu {
float:left;
- border:1px solid black;
+ border-right:1px solid black;
+ padding:10px;
+ margin:5px;
font-size:0.8em;
}
@@ -68,6 +78,7 @@
font-weight:normal;
color:black;
}
+
#menu ul a:hover {
display:block;
margin-bottom:5px;
@@ -85,3 +96,118 @@
margin-top:0px;
}
+#usermenu a {
+ background-color : #6699CC;
+ color : #FFFFFF;
+ font-size : 1em;
+ border: 2px outset;
+ font-weight : bold;
+ margin:0px 5px 0px 0px;
+ padding-right:5px;
+ padding-left:5px;
+ text-decoration:none;
+ display: inline;
+}
+
+#usermenu a:hover {
+ border: 2px inset;
+ background-color:#CCCCCC;
+}
+
+#problem {
+ color: red;
+ background-color:white;
+ font-weight : bold;
+}
+
+#admin_stopwords_select UL {
+ width: 600px;
+}
+
+#admin_stopwords_select UL LI {
+ white-space: nowrap;
+}
+
+#action a {
+ background-color : #6699CC;
+ color : #FFFFFF;
+ font-size : 1em;
+ border: 2px outset;
+ font-weight : bold;
+ margin:0px 5px 0px 0px;
+ padding-right:5px;
+ padding-left:5px;
+ text-decoration:none;
+ display: inline;
+}
+
+#action a:hover {
+ border: 2px inset;
+ background-color:#CCCCCC;
+}
+
+/* facets bloc */
+#facets {
+ float:right;
+ margin-top: 15px;
+ margin-left: 15px;
+ border:1px solid #CCCCCC;
+}
+
+#facets h2 {
+ background-color:#CCCCCC;
+ margin:0px;
+ padding:0px;
+ font-size:1.1em;
+}
+
+/* the USER information block */
+#librarian_information {
+/* position:absolute; */
+ float:right;
+ font-size:10pt;
+}
+
+.legend {
+ font-size:120%;
+ font-weight:bold;
+}
+
+.problem {
+ color: white;
+ background-color:red;
+}
+
+/* css styles for reserves color alerts */
+.onloan {
+ background-color: #FFED3D;
+}
+
+.reserved {
+ background-color: #8EBAFF;
+}
+
+.transfered {
+ background-color: #F9FF9A;
+}
+
+.inwait {
+ background-color: #33CC99;
+}
+
+.other {
+ background-color: #FF0000;
+}
+
+.available {
+ background-color: white;
+}
+
+.unavailable {
+ background-color: #FFED3D;
+}
+
+/* style for search terms in catalogsearch */
+.term {
+ background-color:yellow;
+}
Index: koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/Attic/usermenu.inc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc 30 Oct 2006 10:15:45
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -1,19 +1,15 @@
-<div id="action">
- <ul>
- <li><a href="/cgi-bin/koha/opac-user.pl">my summary</a> </li>
- <li><a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li>
- <li><a href="/cgi-bin/koha/opac-userdetails.pl">my personal
details</a></li>
- <!-- TMPL_IF name="OpacPasswordChange" -->
- <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my
password</a></li>
- <!-- /TMPL_IF -->
+<div id="usermenu">
+ <a href="/cgi-bin/koha/opac-user.pl">my summary</a>
+ <a href="/cgi-bin/koha/opac-account.pl">my fines</a>
+ <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>
+ <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a>
<!-- TMPL_IF NAME="opacreadinghistory" -->
- <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading
history</a></li>
+ <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading
history</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="virtualshelves" -->
- <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my
book lists</a></li>
+ <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book
lists</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="suggestion" -->
- <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase
suggestions</a></li>
+ <a href="/cgi-bin/koha/opac-suggestions.pl">purchase
suggestions</a>
<!-- /TMPL_IF -->
- </ul>
</div>
\ No newline at end of file
Index: koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -4,8 +4,6 @@
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!--CONTENT-->
-
-<div id="main">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h1>
@@ -46,5 +44,5 @@
<!-- TMPL_ELSE -->
<h4>You have no Fines or Charges</h4>
<!-- /TMPL_IF -->
-</div>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.5
@@ -1,21 +1,24 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Advanced Search<!-- TMPL_INCLUDE
NAME="doc-head-close.inc" -->
-<body id="withsidebar">
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang"
-->/includes/livesearch.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang"
-->/includes/main.js"></script>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" -->
+ Catalog -- Advanced Search
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<form action="opac-search.pl" method="get">
-<div id="main">
- <div class="content-block" id="advanced-search">
- <!-- TMPL_IF NAME="expanded_options" -->
- <h3>Advanced Search</h3>
- <!-- TMPL_ELSE -->
- <h3>Search the Library Catalog</h3>
- <!-- /TMPL_IF -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
- <!-- TMPL_IF NAME="expanded_options" -->
- <!-- TMPL_IF NAME="outer_servers_loop" -->
- <!-- DATABASES -->
- <fieldset>
+<!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+<!-- /TMPL_IF -->
+
+<form action="/cgi-bin/koha/opac-search.pl" method="get">
+ <div id="main-sidebar">
+ <div id="advanced-search">
+
+<!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
+<!-- TMPL_IF NAME="outer_servers_loop" -->
+<!-- DATABASES -->
+
+<fieldset>
<legend>Select local databases:</legend>
<p>
<!-- TMPL_LOOP NAME="outer_servers_loop" -->
@@ -24,13 +27,13 @@
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
</p>
- </fieldset>
- <!-- /DATABASES -->
- <!-- /TMPL_IF -->
-
- <!-- TMPL_IF NAME="outer_sup_servers_loop" -->
- <!-- REMOTE DATABASES -->
- <fieldset>
+</fieldset>
+<!-- /DATABASES -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="outer_sup_servers_loop" -->
+<!-- REMOTE DATABASES -->
+<fieldset>
<legend>Select remote databases:</legend>
<p>
<!-- TMPL_LOOP NAME="outer_sup_servers_loop" -->
@@ -40,11 +43,11 @@
<!-- /TMPL_LOOP -->
</p>
</fieldset>
- <!-- /REMOTE DATABASES -->
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+<!-- /REMOTE DATABASES -->
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
- <!-- BOOLEAN SEARCH OPTIONS -->
+<!-- BOOLEAN SEARCH OPTIONS -->
<fieldset>
<!-- TMPL_IF NAME="expanded_options" --><legend>Search
For:</legend><!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="search_boxes_loop" -->
@@ -52,136 +55,410 @@
<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF
NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE
--><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR
NAME="left_content" --><!-- /TMPL_IF -->
<select name="idx">
- <!-- TMPL_LOOP NAME="indexes" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF
NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF
-->><!-- TMPL_VAR NAME="label" --></option>
- <!-- /TMPL_LOOP -->
+ <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+ <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
+ <option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Author
Phrase</option>
+ <option value="cpn" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>
Corporate Name</option>
+ <option value="cfn" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>
Conference Name</option>
+ <option value="cpn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>
Corporate Name Phrase</option>
+ <option value="cfn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>
Conference Name Phrase</option>
+ <option value="pn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->> Personal
Name</option>
+ <option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>
Personal Name Phrase</option>
+ <option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
+ <option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
+ <option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
+ <option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
+ <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
+ <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->> ISBN</option>
+ <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->> ISSN</option>
+ <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Call
Number</option>
+ <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
+ <option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Subject
Phrase</option>
+ <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
+ <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!--
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Title
Phrase</option>
+ <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR
NAME="selected" -->"<!-- /TMPL_IF -->> Series
Title</option>
+
</select>
- <input size="30" name="q" title="Enter search terms" value=""/>
+ <input type="text" size="30" name="q" title="Enter search terms"
value=""/>
<!-- TMPL_IF NAME="expanded_options" -->
<!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR NAME="scan_index"
--><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="add_field" --><a href="" title="Add another
field">[+]</a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="add_field" --><a href="JavaScript:add_field();"
id="ButtonPlus" title="Add another field">[+]</a><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</p>
<!-- /TMPL_LOOP -->
</fieldset>
- <!-- /BOOLEAN SEARCH OPTIONS -->
+<!-- /BOOLEAN SEARCH OPTIONS -->
+<fieldset style="margin-right:20%">
+ <legend>Itemtype to: match any of the following </legend>
+ <p>
+ <!--TMPL_LOOP Name="itemtypeloop"-->
+ <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->"
name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><img border="0"
src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description"
-->" title="<!--TMPL_VAR Name="description" -->"/>
+ <!-- TMPL_UNLESS name="count5" --></p><p><!-- /TMPL_UNLESS -->
+ <!--/TMPL_LOOP-->
+ </p>
+ </p>
+</fieldset>
- <!-- TMPL_IF NAME="expanded_options" -->
- <!-- BASIC LIMITS -->
+<!-- TMPL_IF NAME="expanded_options" -->
+<!-- BASIC LIMITS -->
+<!--TMPL_IF Name="usmarc"-->
<fieldset>
- <legend>Limits:</legend>
- <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add
publication,copyright,acquisition options -->
- <p><label for="limit-yr">Year: </label>
- <input size="15" name="limit-yr" id=""
value=""/> (format: yyyy-yyyy)</p>
- <!-- /PUB / COPY YEAR LIMIT -->
- <!-- /YEAR LIMIT -->
-
- <!-- LANGUAGE LIMIT -->
- <p><label for="language-limit">Language: </label>
- <select name="limit">
- <!-- TMPL_LOOP NAME="search_languages_loop" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" <!--
TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!--
/TMPL_IF -->><!-- TMPL_VAR NAME="language_label" --> <!-- TMPL_IF
NAME="locale_label" -->(<!-- TMPL_VAR NAME="locale_label" -->)<!-- /TMPL_IF
--></option>
- <!-- /TMPL_LOOP -->
- </select></p><!-- <a href="">Show all languages</a>-->
- <!-- /LANGUAGE LIMIT -->
- </fieldset>
- <!-- /BASIC LIMITS -->
- <!-- /TMPL_IF -->
- <!-- TYPE LIMITS -->
- <fieldset>
<legend>Limit type to: match any of the following <a
href="http://wiki.koha.org/?id=en:opachelp#"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#','
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a></legend>
<table class="itemtypes">
- <!-- TMPL_LOOP NAME="outer_limit_types_loop" -->
<tr>
- <!-- TMPL_LOOP NAME="inner_limit_types_loop" -->
- <td<!-- TMPL_IF NAME="colspan" --> colspan="<!-- TMPL_VAR
NAME="colspan" -->"<!-- /TMPL_IF -->><input type="checkbox" id="<!-- TMPL_VAR
NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR
NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->" title="<!--
TMPL_VAR NAME="title" -->"><a href="http://wiki.koha.org/?id=en:opachelp#<!--
TMPL_VAR NAME="id" -->" class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#<!-- TMPL_VAR
NAME="id" -->','<!-- TMPL_VAR NAME="label" -->
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="<!-- TMPL_VAR NAME="themelang">/images/<!--
TMPL_VAR NAME="icon" -->" alt="<!-- TMPL_VAR NAME="label" -->" /></a><!--
TMPL_VAR NAME="label" --></label></td>
- <!-- /TMPL_LOOP -->
+ <td><input type="checkbox" id="mc-bks" name="limit"
value="mc:t"/><label for="mc-bks" title="Books, Pamphlets, Technical reports,
Manuscripts, Legal papers, Theses and dissertations"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-bks"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-bks','Books
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books"
/></a>Books</label></td>
+ <td><input type="checkbox" id="mc-vis" name="limit"
value="mc:v"/><label for="mc-vis" title="Motion pictures, Videorecordings,
Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-vis"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-vis','Visual
Materials Help','width=350,top=50,left=50,resizable,scrollbars,height=650');
return false;"><img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif"
alt="Visual Materials" /></a>Visual Materials</label></td>
+ <td><input type="checkbox" id="mc-sr" name="limit"
value="mc-rtype:i"/><label for="mc-sr" title="Spoken, Books on CD and
Cassette"><a href="http://wiki.koha.org/?id=en:opachelp#mc-sr"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-sr','Books on
Tape Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books
on Tape" /></a>Books on Tape</label></td>
</tr>
- <!-- /TMPL_LOOP -->
+ <tr>
+ <td><input type="checkbox" id="mc-cf" name="limit"
value="mc:c"/><label for="mc-cf" title="Computer files, Data, Software"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-cf"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-cf','Computer
Files Help','width=350,top=50,left=50,resizable,scrollbars,height=650');
return false;"><img border="0" src="/intranet-tmpl/prog/en/images/CD-ROM
software.gif" alt="Computer Files" /></a>Computer Files</label></td>
+ <td><input type="checkbox" id="mc-lh" name="limit"
value="mc-collection:LH"/><label for="mc-lh" title="Local History Materials"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-lh"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-lh','Local
History Materials
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/Local history.gif"
alt="Local History Materials" /></a>Local History Materials</label></td>
+ <td><input type="checkbox" id="mc-map" name="limit"
value="mc:a"/><label for="mc-map" title="Maps, Globes"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-map"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-map','Maps
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps"
/></a>Maps</label></td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" id="mc-mus" name="limit"
value="mc-rtype:j"/><label for="mc-mus" title="Music"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-mus"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-mus','Music
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music"
/></a>Music</label></td>
+ <td><input type="checkbox" id="mc-kit" name="limit"
value="mc-rtype:o"/><label for="mc-kit" title="Kits"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-kit"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-kit','Kits
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits"
/></a>Kits</label></td>
+ <td><input type="checkbox" id="mc-ref" name="limit"
value="mc-collection:REF"/><label for="mc-ref" title="Reference"><a
href="http://wiki.koha.org/?id=en:opachelp#mc-ref"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#mc-ref','Reference
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;"><img border="0" src="/intranet-tmpl/prog/en/images/REF.gif"
alt="Reference" /></a>Reference</label></td>
+
+ </tr>
+
</table>
- </fieldset>
- <!-- /TYPE LIMITS -->
+</fieldset>
+<!-- /TYPE LIMITS -->
- <div id="sidebar">
- <!-- TMPL_IF NAME="outer_subtype_limits_loop" -->
- <!-- SUBTYPE LIMITS -->
+
+</div>
+</div>
+<div id="sidebar">
+<!-- SUBTYPE LIMITS -->
<fieldset>
<legend>Subtype limits</legend><p>
- <!-- TMPL_LOOP NAME="outer_subtype_limits_loop" -->
- <select name="<!-- TMPL_VAR NAME="name" -->"
class="subtype">
- <!-- TMPL_LOOP NAME="inner_subtype_limits_loop" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" <!--
TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"
class="menuheader"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
- <!-- /TMPL_LOOP -->
+
+ <select name="limit" class="subtype">
+ <option value="" selected="selected" class="menuheader">Any
Audience</option>
+ <option value="aud:a" >Easy</option>
+ <option value="aud:c" >Juvenile</option>
+ <option value="aud:d" >Young Adult</option>
+ <option value="aud:e" >Adult</option>
+ </select>
+
+ <select name="limit" class="subtype">
+ <option value="" selected="selected" class="menuheader">Any
Content</option>
+ <option value="fic:1" >Fiction</option>
+ <option value="fic:0" >Non Fiction</option>
+ <option value="bio:b" >Biography</option>
+ <option value="mus:j" >Musical recording</option>
+ <option value="mus:i" >Non-musical recording</option>
</select>
- <!-- /TMPL_LOOP --><a
href="http://wiki.koha.org/?id=en:opachelp#"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a></p>
- </fieldset>
- <!-- /SUBTYPE LIMITS -->
- <!-- /TMPL_IF -->
+ <select name="limit" class="subtype">
+ <option value="" selected="selected" class="menuheader">Any
Format</option>
+ <option value="l-format:ta" >Regular print</option>
+ <option value="l-format:tb" >Large print</option>
+ <option value="l-format:fk" >Braille</option>
+ <option value="" >-----------</option>
+ <option value="l-format:sd" >CD audio</option>
+ <option value="l-format:ss" >Cassette recording</option>
+ <option value="l-format:vf" >VHS tape / Videocassette</option>
+ <option value="l-format:vd" >DVD video / Videodisc</option>
+ <option value="l-format:co" >CD Software</option>
+ <option value="l-format:cr" >Website</option>
+ </select>
+
+ <select name="limit" class="subtype">
+ <option value="" >Additional Content Types</option>
+ <option value="ctype:a" >Abstracts/summaries</option>
+ <option value="ctype:b" >Bibliographies</option>
+ <option value="ctype:c" >Catalogs</option>
+ <option value="ctype:d" >Dictionaries</option>
+ <option value="ctype:e" >Encyclopedias </option>
+ <option value="ctype:f" >Handbooks</option>
+ <option value="ctype:g" >Legal articles</option>
+ <option value="ctype:i" >Indexes</option>
+ <option value="ctype:j" >Patent document</option>
+ <option value="ctype:k" >Discographies</option>
+ <option value="ctype:l" >Legislation</option>
+ <option value="ctype:m" >Theses</option>
+ <option value="ctype:n" >Surveys</option>
+ <option value="ctype:o" >Reviews</option>
+ <option value="ctype:p" >Programmed texts</option>
+ <option value="ctype:q" >Filmographies</option>
+ <option value="ctype:r" >Directories</option>
+ <option value="ctype:s" >Statistics</option>
+ <option value="ctype:t" >Technical reports</option>
+ <option value="ctype:v" >Legal cases and case notes</option>
+ <option value="ctype:w" >Law reports and digests</option>
+ <option value="ctype:z" >Treaties </option>
+ </select>
+ <a href="http://wiki.koha.org/?id=en:opachelp#"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#subtypes','Sub-types
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a></p>
+
+</fieldset>
+<!--/TMPL_IF -->
+<!--TMPL_IF Name="UNIMARC" -->
+</div></div>
+<div id="sidebar">
+<!-- SUBTYPE LIMITS -->
<fieldset>
- <!-- TMPL_IF NAME="itemtypeloop" -->
- <legend>Collection Code Limits: </legend>
- <p><select name="limit">
- <option value="">All Collection Codes</option>
- <!-- TMPL_LOOP NAME="itemtypeloop" -->
- <option value="collection-code:<!-- TMPL_VAR
NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
- <!-- /TMPL_LOOP -->
+ <legend>Champs Codés</legend>
+ <p>
+ <label>Public</label>
+ <select name="limit" class="subtype">
+ <option value="" SELECTED="selected" class="menuheader">Tout
public</option>
+ <option value="aud:a">Jeunesse en
général</option>
+ <option value="aud:b">Pré-scolaire</option>
+ <option value="aud:c">scolaire</option>
+ <option value="aud:d">enfant</option>
+ <option value="aud:e">jeune adulte</option>
+ <option value="aud:k">adulte, haut niveau</option>
+ <option value="aud:m">fiction ou vulg adulte</option>
+ <option value="aud:u">inconnu</option>
</select>
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="itypeloop" -->
- <select name="limit">
- <option value="">All Item Types</option>
- <!-- TMPL_LOOP NAME="itypeloop" -->
- <option value="collection-code:<!-- TMPL_VAR
NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
- <!-- /TMPL_LOOP -->
- </select></p>
- <!-- /TMPL_IF -->
+ </p>
+ <p>
+ <label>Format</label>
+ <select name="limit" class="subtype">
+ <option value="" selected="selected"
class="menuheader">Tout format</option>
+ <option value="Material-type:r">Impression
normale</option>
+ <option value="Material-type:d">Impression en
gros caractere</option>
+ <option value="Material-type:e">Journal</option>
+ <option value="Material-type:f">Caractere
braille et moon</option>
+ <option
value="Material-type:g">Micro-impression</option>
+ <option
value="Material-type:h">Manuscrit</option>
+ <option
value="Material-type:i">Multimedia</option>
+ <option value="Material-type:j">Impression en
reduction</option>
+ <option value="Material-type:z">Autres formes
de presentation</option>
+ </select>
+ </p>
+ <p>
+ <label>Forme</label>
+ <select name="limit" class="subtype">
+ <option value="" selected="selected"
class="menuheader">Toute forme</option>
+ <option value="Literature-Code:a">fiction, roman</option>
+ <option value="Literature-Code:b">Theatre, piece televisee</option>
+ <option value="Literature-Code:c">Essais</option>
+ <option value="Literature-Code:d">Humour, satire</option>
+ <option value="Literature-Code:e">Lettres</option>
+ <option value="Literature-Code:f">Nouvelles</option>
+ <option value="Literature-Code:g">Poesie</option>
+ <option value="Literature-Code:h">Discours, art oratoire</option>
+ <option value="Literature-Code:y">Il ne s'agit pas d'un texte
litteraire</option>
+ <option value="Literature-Code:z">formes variées ou autres
formes litteraires</option>
+ </select>
+ </p>
+ <p>
+ <label>Biographie</label>
+ <select name="limit" class="subtype" size="1">
+ <option value="">Tout type de biographie</option>
+ <option value="Biography-code:y">C'est pas une biographie</option>
+ <option value="Biography-code:a">autobiographie (y compris
correspondance...)</option>
+ <option value="Biography-code:b">Biographie individuelle</option>
+ <option value="Biography-code:c">Biographie collective</option>
+ <option value="Biography-code:d">Contient des informations
biographiques</option>
+ </select>
+ </p>
+ <p>
+ <label>Illustration</label>
+ <select name="limit" class="subtype" size="1">
+ <option value="">Tout type d'illustration</option>
+ <option value="Illustration-Code:a">Illustrations</option>
+ <option value="Illustration-Code:b">Cartes</option>
+ <option value="Illustration-Code:c">Portraits</option>
+ <option value="Illustration-Code:d">cartes marines</option>
+ <option value="Illustration-Code:e">plans</option>
+ <option value="Illustration-Code:f">Planches</option>
+ <option value="Illustration-Code:g">Musique imprimee</option>
+ <option value="Illustration-Code:h">fac-similes</option>
+ <option value="Illustration-Code:i">armoiries</option>
+ <option value="Illustration-Code:j">Tables Genealogique</option>
+ <option value="Illustration-Code:k">Formulaires</option>
+ <option value="Illustration-Code:l">Specimens</option>
+ <option value="Illustration-Code:m">Enregistrement sonore</option>
+ <option value="Illustration-Code:n">Transparents</option>
+ <option value="Illustration-Code:o">Enluminures</option>
+ <option value="Illustration-Code:y">Sans illustrations</option>
+ </select>
+ </p>
+ <p>
+ <label>Contenu</label>
+ <select name="limit" class="subtype">
+ <option value="" >Tout type de contenu</option>
+ <option value="ctype:a" >Bibliographie</option>
+ <option value="ctype:b" >Catalogue</option>
+ <option value="ctype:c" >index</option>
+ <option value="ctype:d" >resume</option>
+ <option value="ctype:e" >Dictionnaire</option>
+ <option value="ctype:f" >encyclopedie</option>
+ <option value="ctype:g" >Repertoire</option>
+ <option value="ctype:h" >Description projet</option>
+ <option value="ctype:i" >statistiques</option>
+ <option value="ctype:j" >Manuels d'enseignement programme</option>
+ <option value="ctype:k" >Brevet</option>
+ <option value="ctype:l" >norme</option>
+ <option value="ctype:m" >Memoire ou these</option>
+ <option value="ctype:n" >Lois et decrets</option>
+ <option value="ctype:o" >Table numerique</option>
+ <option value="ctype:p" >Rapport technique</option>
+ <option value="ctype:q" >Sujet d'examen</option>
+ <option value="ctype:r" >Synthese bibliographique</option>
+ <option value="ctype:s" >Traite</option>
+ <option value="ctype:t" >Bande dessinee</option>
+ <option value="ctype:z" >Autres</option>
+ </select>
+ </p>
+ <p>
+ <label>Type vidéo</label>
+ <select name="limit" class="subtype">
+ <option value="">Tout type video</option>
+ <option value="Video-mt:a">Film</option>
+ <option value="Video-mt:b">Document à
projeter</option>
+ <option value="Video-mt:c">Enregistrement video</option>
+ </select>
+ </p>
</fieldset>
+ <fieldset>
+ <legend>Périodique</legend><p>
+ <p>
+ <label>Type periodique</label>
+ <select name="limit" class="subtype">
+ <option value="">Tout type de periodique</option>
+ <option value="Type-Of-Serial:a">Periodique</option>
+ <option value="Type-Of-Serial:b">Collection des
monographies</option>
+ <option value="Type-Of-Serial:c">Journal</option>
+ <option value="Type-Of-Serial:z">autres</option>
+ </select>
+ </p>
+ <p>
+ <label>Périodicité</label>
+ <select name="limit" class="subtype">
+ <option value="">Toute
Périodicité</option>
+ <option
value="Frequency-code:a">Quotidien</option>
+ <option
value="Frequency-code:b">Bihebdomadaire</option>
+ <option
value="Frequency-code:c">Hebdomadaire</option>
+ <option value="Frequency-code:d">Toutes les
deux semaines</option>
+ <option value="Frequency-code:e">Deux fois par
mois</option>
+ <option
value="Frequency-code:f">Mensuel</option>
+ <option
value="Frequency-code:g">Bimestriel</option>
+ <option
value="Frequency-code:h">Trimestriel</option>
+ <option value="Frequency-code:i">Trois fois par
an</option>
+ <option
value="Frequency-code:j">Semestriel</option>
+ <option value="Frequency-code:k">Annuel</option>
+ <option
value="Frequency-code:l">Bisanuel</option>
+ <option
value="Frequency-code:m">Triennal</option>
+ <option value="Frequency-code:n">Trois fois par
semaine</option>
+ <option value="Frequency-code:o">Trois fois par
mois</option>
+ <option
value="Frequency-code:u">Inconnue</option>
+ <option value="Frequency-code:y">Sans
periodicite</option>
+ <option value="Frequency-code:i">Autre</option>
+ </select>
+ </p>
+ <p>
+ <label>Toute Régularité</label>
+ <select name="limit" class="subtype">
+ <option value="">Régularité</option>
+ <option
value="Regularity-code:u">Inconnu</option>
+ <option
value="Regularity-code:a">Regulier</option>
+ <option value="Regularity-code:b">Normalement
irregulier</option>
+ <option
value="Regularity-code:y">Irregulier</option>
+ </select>
+ </p>
+
+ </fieldset>
+ <fieldset>
+ <legend>Document pictural</legend><p>
+ <select name="limit" class="subtype">
+ <option value="">Tout type</option>
+ <option value="Graphics-type:a">Collage</option>
+ <option value="Graphics-type:b">Dessin</option>
+ <option
value="Graphics-type:c">Peinture</option>
+ <option value="Graphics-type:d">Reproduction
photomecanique</option>
+ <option value="Graphics-type:e">Negatif
photo</option>
+ <option value="Graphics-type:f">Tirage
photographique</option>
+ <option value="Graphics-type:h">Image</option>
+ <option value="Graphics-type:i">Gravure</option>
+ <option value="Graphics-type:k">Dessin
technique</option>
+ <option value="Graphics-type:z">Autres types de
documents graphique non projetable</option>
+ </select>
+ <select name="limit" class="subtype">
+ <option value="">tout support</option>
+ <option value="Graphics-support:a">Toile</option>
+ <option value="Graphics-support:b">Carte bristol</option>
+ <option value="Graphics-support:c">Carton / carte a dessin</option>
+ <option value="Graphics-support:d">Verre</option>
+ <option value="Graphics-support:j">Platre</option>
+ <option value="Graphics-support:k">Isorel</option>
+ <option value="Graphics-support:l">Porcelaine</option>
+ <option value="Graphics-support:m">Pierre</option>
+ <option value="Graphics-support:n">Bois</option>
+ <option value="Graphics-support:u">Inconnu</option>
+ <option value="Graphics-support:v">Support composite</option>
+ <option value="Graphics-support:e">Synthetique (plastique,
vinyle...)</option>
+ <option value="Graphics-support:f">Peau</option>
+ <option value="Graphics-support:g">Textile</option>
+ <option value="Graphics-support:h">Metal</option>
+ <option value="Graphics-support:i">Papier</option>
+ <option value="Graphics-support:z">Autres</option>
+ </select>
+ </p>
- <!-- AVAILABILITY LIMITS -->
+</fieldset>
+<!--/TMPL_IF-->
+<!--/TMPL_IF-->
+<!-- AVAILABILITY LIMITS -->
<fieldset><legend>Location and availability: </legend>
- <p><select name="limit" id="branchloop">
+ <p>
+ <label>Branch</label><select name="limit" id="branchloop">
<!-- TMPL_LOOP NAME="branchloop" -->
<option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR
NAME='branchname' --></option>
<!-- /TMPL_LOOP -->
</select>
-
- <input type="checkbox" id="available-items" name="limit"
value="datedue:0000-00-00"/><label for="available-items">Only items currently
available</label></p>
+ </p>
+ <p>
+ <label for="available-items">Only items currently
available</label><input type="checkbox" id="available-items" name="limit"
value="datedue:0000-00-00"/></p>
</fieldset>
- <!-- /AVAILABILITY LIMITS -->
+<!-- /AVAILABILITY LIMITS -->
- <!-- RANK LIMITS -->
- <!-- TMPL_IF NAME="sort_by_loop" -->
- <fieldset>
- <legend>Sort by: </legend>
- <p>
- <select id="sort_by" name="sort_by">
+<!-- RANK LIMITS -->
+<!-- TMPL_IF NAME="sort_by_loop" -->
+<fieldset><legend>Sort by: </legend>
+ <p><select id="sort_by" name="sort_by">
<option value="">Field-weighted, Relevance Ranked</option>
<!-- TMPL_LOOP NAME="sort_by_loop" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!--
TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!--
/TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
<!-- /TMPL_LOOP -->
</select>
- <a href="http://wiki.koha.org/?id=en:opachelp#sort_by";
class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a>
- </p>
- </fieldset>
- <!-- /TMPL_IF -->
- <!-- RANK LIMITS -->
- <!-- SEARCH BUTTONS -->
- <p><input class="submit" type="submit" accesskey="s"
title="Search" value="Search"/>
+ <a href="http://wiki.koha.org/?id=en:opachelp#sort_by"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a></p>
+</fieldset>
+<!-- /TMPL_IF -->
+<!-- RANK LIMITS -->
+<p></p>
+<!-- SEARCH BUTTONS -->
+ <p><input class="submit" type="submit" accesskey="s" name="do"
title="Search" value="Search"/>
<!-- TMPL_IF NAME="expanded_options" -->
- <a href="opac-search.pl">[Fewer Options]</a>
+ <a href="/cgi-bin/koha/opac-search.pl">[Fewer Options]</a>
<!-- TMPL_ELSE -->
- <a href="opac-search.pl?expanded_options=1">[More
options]</a>
+ <a
href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
<!-- /TMPL_IF -->
- <a href="opac-search.pl?do=Clear">[New Search]</a>
+ <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New
Search]</a>
</p>
- <!-- /SEARCH BUTTONS -->
- </div>
-</div>
+<!-- /SEARCH BUTTONS -->
</div>
</form>
+<script type="text/JavaScript" language="JavaScript">
+ /**
+ * Function add_field();
+ * This function allows to display a new field to search.
+ */
+ function add_field() {
+ var ButtonPlus = document.getElementById('ButtonPlus');
+ var line = ButtonPlus.parentNode;
+ var dad = line.parentNode;
+ dad.appendChild(line.cloneNode(true));
+ line.removeChild(ButtonPlus);
+ }
+</script>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authorities-home.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl 22 Nov 2006
15:47:30 -0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl 7 Dec 2006
15:42:15 -0000 1.1.2.3
@@ -1,10 +1,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> -- Library Catalog
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
-
<h1>Authority search</h1>
<div id="bloc60">
@@ -62,5 +61,5 @@
</div>
</form>
</div>
-</div>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.1
+++ koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.2
@@ -1,24 +1,29 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Your Book Bag<!-- TMPL_IF
NAME="print_basket" --><!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc"
--><!-- TMPL_ELSE --><!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" --><!--
/TMPL_IF -->
-
-<div id="window">
- <!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
- <!-- MENUS -->
-
-<!-- TMPL_IF NAME="verbose" -->
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="showLess(); return false;" value="Brief Display" /></form>
-<!-- TMPL_ELSE -->
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="showMore(); return false;" value="More Details" /></form>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" -->
+ Catalog -- Your Book Bag
+ <!-- TMPL_IF NAME="print_basket" -->
+ <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
<!-- /TMPL_IF -->
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="delSelRecords(); return false;" value="Remove Selected Items" /></form>
-
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="sendBasket(); return false;" value="Send" /></form>
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="printBasket(); return false;" value="Print" /></form>
+<div> <!-- main -->
- <form action="opac-basket.pl" method="get"><input type="submit"
onclick="delBasket(); return false;" value="Empty and Close" /></form>
-<form action="opac-basket.pl" method="get"><input type="submit"
onclick="quit(); return false;" value="Hide Window" /></form>
-<!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
+<div id="action">
+ <!-- TMPL_IF NAME="verbose" -->
+ <a href="opac-basket.pl" onclick="showLess(); return false;">Brief
Display<a/>
+ <!-- TMPL_ELSE -->
+ <a href="opac-basket.pl" onclick="showMore(); return false;">More
Details<a/>
+ <!-- /TMPL_IF -->
+ <a href="opac-basket.pl" onclick="delSelRecords(); return false;">Remove
Selected Items<a/>
+ <a href="opac-basket.pl" onclick="sendBasket(); return false;">Send<a/>
+ <a href="opac-basket.pl" onclick="printBasket(); return false;">Print<a/>
+ <a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and
Close<a/>
+ <a href="opac-basket.pl" onclick="quit(); return false;">Hide Window<a/>
+ <!-- /TMPL_UNLESS -->
+</div>
<!-- TMPL_IF NAME="verbose" -->
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
@@ -80,6 +85,6 @@
<!-- TMPL_UNLESS NAME="print_basket" -->
<form name="myform"><input type="hidden" name="records"></form>
<!-- /TMPL_UNLESS -->
-</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
Index: koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl 5 Dec 2006 11:35:31
-0000 1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.5
@@ -1,175 +1,216 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP
NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-
-<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn"
-->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image"
/></a><!-- TMPL_ELSE --><img border="0"
src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif";
alt="Book Cover Image" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
-
-
-<ul>
-<!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve"
href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
-<li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
-<!-- Hide from NPL --> <li><a class="isbd"
href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
-<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"
onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">Print</a></li>
-<!-- TMPL_IF name="virtualshelves" --><li><a class="shelf"
href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!--
/TMPL_IF -->
-<li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
-</ul>
-
-
-<h4>Search for this title in:</h4>
-<ul>
-<li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title"
ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
-<li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR
NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul>
+<div id="action">
+<!-- TMPL_UNLESS NAME="norequests" -->
+ <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Place Reserve
+ </a>
+<!-- /TMPL_UNLESS -->
+ <a class="detail"
href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ MARC View
+ </a>
+ <a class="isbd"
href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ ISBD
+ </a>
+ <a class="print"
href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->'); return false;">
+ Print
+ </a>
+<!-- TMPL_IF name="virtualshelves" -->
+ <a class="shelf"
href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">
+ Add to My Book List
+ </a>
+<!-- /TMPL_IF -->
+ <a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">
+ Add to My Book Bag
+ </a>
+</div>
-<h2>
+<div id="catalogue_detail_biblio">
+ <h2>Biblio detail</h2>
+ <!-- TMPL_IF NAME="AmazonContent" -->
+ <!-- TMPL_IF NAME="isbn" -->
+ <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link">
+ <img border="0" src="http://images.amazon.com/images/P/<!--
TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg"
alt="Book Cover Image" />
+ </a><!-- TMPL_ELSE -->
+ <img border="0"
src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif";
alt="Book Cover Image" />
+ <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+ <h1 style="display:inline;">
<!-- TMPL_VAR NAME="title" -->
- <!-- TMPL_IF NAME="subtitle" -->
- <!-- TMPL_VAR NAME="subtitle" -->
+ <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!--
/TMPL_IF -->
+ <!-- TMPL_VAR NAME="class" -->
+ </h1>
+
+ <!-- TMPL_IF name="subtitles" -->
+ <p><label><b>Subtitle(s):</b></label>
+ <!-- TMPL_LOOP name="subtitles" -->
+ <!-- TMPL_VAR NAME="subtitle" --> ;
+ <!-- /TMPL_LOOP -->
+
+ </p>
<!-- /TMPL_IF -->
-</h2>
-
-<!-- TMPL_IF NAME="author" -->
-<h3>By <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author"
-->">
- <!-- TMPL_VAR NAME="author" -->
+ <!-- TMPL_IF name="author" -->
+ <p><label><b>Author: </b></label>
+ <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author"
-->">
+ <!-- TMPL_VAR NAME="author" -->
</a>
-</h3>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="MARCAUTHORS" -->
-<p><label><b>Additional Author:</b></label>
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="MARCAUTHORS" -->
+ <p><label><b>Additional Author:</b></label>
<!-- TMPL_LOOP NAME="MARCAUTHORS" -->
<a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="a" -->">
- <!-- TMPL_VAR NAME="a" -->
- </a> --
+ <!-- TMPL_VAR NAME="a" -->
+ </a>
<!-- /TMPL_LOOP -->
-</p>
-<!-- /TMPL_IF -->
-
-
-
-<table>
-
-<!-- TMPL_UNLESS NAME="MARCNOTES" -->
-
-<!-- TMPL_IF NAME="notes" -->
-<tr><th scope="row">Notes:</th><td><!-- TMPL_VAR NAME="notes"
--></td></tr><!-- /TMPL_IF -->
-
-<!-- /TMPL_UNLESS -->
-
-<!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
-
-<!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP
name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?q=su:<!-- TMPL_VAR
NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!--
/TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
-
-<!-- /TMPL_UNLESS -->
-
-<!-- TMPL_IF NAME="MARCNOTES" -->
- <tr>
- <th scope="row">Detailed notes:</th>
- <td scope="row"><ul><!-- TMPL_LOOP NAME="MARCNOTES"
--><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
+ </p>
<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="MARCSUBJCTS" -->
- <tr>
- <th scope="row">Related links:</th>
- <td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- <!-- TMPL_IF
name="linkvalue" -->
- <li><a
href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR
name="link" -->&and_or=and&operator==&value=<!-- TMPL_VAR
NAME="linkvalue" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li>
+ <!-- TMPL_IF name="illus" -->
+ <p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" --> </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publishercode" -->
+ <p><label><b>Published by :</b></label>
+ <a href="/cgi-bin/koha/opac-search.pl?q=pb:<!-- TMPL_VAR
NAME="publishercode"-->">
+ <!-- TMPL_VAR NAME="publishercode" -->
+ </a>
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publicationyear" -->
+ <p><label><b>in</b></label><!-- TMPL_VAR NAME="publicationyear"
--> </p>
+ <!-- /TMPL_IF -->
+ <p>
+ <label> </label>
+ <!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR
name="pages" -->
+ <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR
name="size" -->
+ </p>
+ <!-- TMPL_IF name="isbn" -->
+ <p><label><b>ISBN: </b></label><!-- TMPL_VAR NAME="isbn" --> </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="issn" -->
+ <p><label><b>ISSN:</b></label><!-- TMPL_VAR NAME="issn" --> </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="seriestitle" -->
+ <p><label><b>Collection: </b></label>
+ <!-- TMPL_VAR NAME="seriestitle" -->
+ <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" -->
<!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF -->
+ <!-- TMPL_VAR name="volumedesc" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="MARCSUBJCTS" -->
+ <p><label><b>Subjects: </b></label></p>
+ <p>
+ <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+ <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="link"
ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
+
+ <!-- /TMPL_LOOP -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="copyrightdate" -->
+ <p><label><b>Year : </b></label><!-- TMPL_VAR NAME="copyrightdate" --></p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="MARCNOTES" -->
+ <p><label><b>Notes: </b></label></p>
+ <p>
+ <!-- TMPL_LOOP NAME="MARCNOTES" -->
+ <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+ <!-- /TMPL_LOOP -->
+ </p>
<!-- TMPL_ELSE -->
- <li><a
href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!--
TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct"
--></a></li>
+ <!-- TMPL_IF name="notes" -->
+ <p><label><b>Notes: </b></label><!-- TMPL_VAR NAME="notes" --></p>
<!-- /TMPL_IF -->
-
-<!-- /TMPL_LOOP --></ul></td></tr>
<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="item_description" -->
-<tr>
-<th scope="row">Item Description (from Amazon.com):</th>
-<td><ul><li><!-- TMPL_VAR NAME="item_description" --></li></ul></td></tr>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF NAME="abstract" --><tr><th scope="row">Format:</th><td><!--
TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="copyrightdate" -->
- <tr><th scope="row">Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate"
--></td></tr>
-<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="seriestitle" --><tr><th
scope="row">Series Title:</th><td><a
href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&and_or=and&excluding=&operator=contains&value=<!--
TMPL_VAR NAME="seriestitle" ESCAPE=URL
-->&resultsperpage=20&orderby=biblio.title&op=do_search"><!--
TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR
NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="isbn" -->
- <tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="isbn"
--></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lccn" -->
- <tr><th scope="row">LCCN:</th><td><!-- TMPL_VAR NAME="lccn"
--></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="publishercode" -->
- <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place"
--> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear"
--></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
- <tr><th scope="row">Physical Details: </th><td><!-- TMPL_VAR
NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size"
--></td></tr>
-<!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-
- <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
- <tr><th scope="row">Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber"
--></td></tr> <!-- /TMPL_LOOP -->
-</table>
-<table>
-<!-- TMPL_IF NAME="MARCURLS" -->
- <tr><th scope="row">Related URLs: </th><td><ul><!-- TMPL_LOOP
NAME="MARCURLS" --><li><a href="<!-- TMPL_VAR NAME="MARCURL" -->"><!-- TMPL_VAR
NAME="MARCURL" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
+ <!-- TMPL_IF name="unititle" -->
+ <p><label><b>Alt title: </b></label><!-- TMPL_VAR NAME="unititle" --></p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="classification" -->
+ <p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass"
--><!-- TMPL_VAR name="classification" --></p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="dewey" -->
+ <p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
<!-- /TMPL_IF -->
-</table>
-<br clear="right" />
+ <!-- TMPL_IF name="URLS" -->
+ <p><label><b>URL: </b></label>
+ <!-- TMPL_LOOP name="URLS" -->
+ <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url"
--></a>
+ <!-- /TMPL_LOOP -->
+ </p>
+ <!-- /TMPL_IF -->
+ <p><label><b>Item type : </b></label>
+ <!-- TMPL_IF name="description" -->
+ <!-- TMPL_VAR name="description" -->
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- /TMPL_IF -->
+ </p>
</div>
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<table>
-<!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
-<tr><!-- <th> </th> -->
-<th>Type/Format</th>
-<th>Call Number</th>
-<th>Location</th>
-<th>Status</th>
-<th>Due Date</th>
-<th>Last Seen</th>
-<!-- <th>Barcode</th> --></tr>
-<tbody>
-<!--INFORMATION ROWS-->
-<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-<tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR
NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode"
-->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
- <td>
- <!-- TMPL_VAR NAME="branchname" -->
<!-- TMPL_VAR NAME="location" -->
- <!-- TMPL_IF name="itemcallnumber" -->
- (<!-- TMPL_VAR
NAME="itemcallnumber" -->)
- <!-- /TMPL_IF -->
- </td>
+<!-- TMPL_IF name="count" -->
+<div id="catalogue_detail_items">
+ <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+ <table>
+ <tr>
+ <th>Item type</th>
+ <th>Location</th>
+ <th>Status</th>
+ <th>Date Due</th>
+ <th>Last seen</th>
+ <th>Barcode</th>
+ <th>Volume</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="description" --></td>
+ <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF
NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF
--></td>
<td>
<!-- TMPL_IF name="datedue" -->
- On loan
+ On issue to <a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="notforloan" -->
+ <!-- TMPL_VAR name="notforloan" -->
<!-- TMPL_ELSE -->
- <!-- TMPL_IF
name="notforloantext" -->
- <!-- TMPL_VAR
name="notforloantext" -->
+ <!-- TMPL_IF name="itemlost"-->
+ Item lost
<!-- TMPL_ELSE -->
- Available
+ <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE
-->Available<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </td>
+ <td><!-- TMPL_VAR NAME="datedue" --></td>
+ <td><!-- TMPL_VAR NAME="datelastseen" --></td>
+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!--
TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber"
-->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR
NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+ <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+ <!-- TMPL_IF NAME="type" -->
+ <td>
+ <a
href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<!-- TMPL_VAR
NAME="biblioitemnumber" -->&item=<!-- TMPL_VAR NAME="itemtype" -->">Fix
Itemtype</a>
</td>
-<td><!-- TMPL_VAR NAME="datedue" --></td>
-<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-<!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
-<!-- /TMPL_LOOP -->
-</tbody>
-</table>
+ <!-- /TMPL_IF -->
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+</div>
<!-- TMPL_ELSE -->
-<table><tr><td>No copies available.</td></tr></table>
+<p>we don't have any physical item for this document</p>
<!-- /TMPL_IF -->
- <!-- TMPL_IF name="subscriptionsnumber" -->
- <p>This is a serial subscription (There are <!-- TMPL_VAR
name="subscriptionsnumber" --> subscriptions associated with this title).</p>
+<!-- TMPL_IF name="subscriptionsnumber" -->
+<div id="catalogue_detail_subscriptions">
+ <h2>This is a serial subscription</h2>
+ <p> (We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions
associated with this title).</p>
<!-- TMPL_LOOP Name="subscriptions" -->
- <!-- TMPL_IF NAME="subscriptionnotes"
--><p><!--TMPL_VAR Name="subscriptionnotes"--> </p><!-- /TMPL_IF -->
- <!--TMPL_IF Name="latestserials"-->
+ <!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR
NAME="subscriptionnotes"--> </p><!-- /TMPL_IF -->
+ <!--TMPL_IF NAME="latestserials"-->
<p> The three latest issues related to this
subscription:</p>
<table>
+ <tr>
+ <th>Issue #</th>
+ <th>Date</th>
+ <th>Status</th>
+ <th>Note</th>
<!--TMPL_LOOP Name="latestserials"-->
<tr>
<td>
@@ -194,13 +235,17 @@
<!--/TMPL_IF-->
<!--/TMPL_IF-->
</td>
+ <td>
+ <!--TMPL_VAR Name="notes"-->
+ </td>
</tr>
<!--/TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
- <p> For more information: View a record of <a
href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->" title="Serial issues">this subscription's
issues</a></p>
+ </div>
<!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="AmazonContent" -->
<!-- Amazon Reviews -->
<div id="itemReviews">
@@ -236,5 +281,16 @@
</div> <!-- itemReviews -->
<!-- /TMPL_IF-->
-</div>
+<script language="javascript" type="text/javascript">
+ function Dopop(link) {
+
newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+ }
+ function confirm_deletion() {
+ var is_confirmed = confirm('Are you sure you want to delete this
biblio?');
+ if (is_confirmed) {
+
window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->";
+ }
+ }
+</script>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl 27 Nov 2006
16:05:40 -0000 1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl 7 Dec 2006
15:42:15 -0000 1.1.2.5
@@ -1,13 +1,13 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Serials
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
<!-- TMPL_UNLESS name="popup" -->
<h1 class="catalogue">Subscription information for <!-- TMPL_VAR
name="bibliotitle" --></h1>
- <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"
class="button catalogue">Back to biblio</a>
+ <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber"
-->" class="button catalogue">Back to biblio</a>
<!-- /TMPL_UNLESS -->
<div class="tabsubs">
<!-- TMPL_LOOP NAME="years" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.4
@@ -1,14 +1,39 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- ISBD
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
+ <div id="action">
+ <!-- TMPL_UNLESS NAME="norequests" -->
+ <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Place Reserve
+ </a>
+ <!-- /TMPL_UNLESS -->
+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Normal View
+ </a>
+ <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ ISBD
+ </a>
+ <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->'); return false;">
+ Print
+ </a>
+ <!-- TMPL_IF name="virtualshelves" -->
+ <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">
+ Add to My Book List
+ </a>
+ <!-- /TMPL_IF -->
+ <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber"
-->'); return false;">
+ Add to My Book Bag
+ </a>
+ </div>
<h3>ISBD</h3>
- <p><!-- TMPL_VAR name="ISBD" --></p>
-
+ <!-- TMPL_VAR name="ISBD" -->
<!-- TMPL_IF name="subscriptionsnumber" -->
- <h2>We have <!-- TMPL_VAR name="subscriptionsnumber" -->
subscription(s) associated with this title.</h2>
+ <h2>
+ We have <!-- TMPL_VAR name="subscriptionsnumber" -->
subscription(s) associated with this title.
+ </h2>
<p>Below is a list of the three latest issues :</p>
<!-- TMPL_LOOP Name="subscriptions" -->
<!-- TMPL_IF name="subscriptionnotes"-->
@@ -56,14 +81,4 @@
</form>
<!-- /TMPL_UNLESS -->
-<form action="opac-MARCdetail.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" value="MARC View" /></form>
-
-<form action="opac-detail.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" value="Simple View" /></form>
-
-<form action="opac-detailprint.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" value="Print"
onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
name="biblionumber" -->'); return false;"/></form>
-
-<form action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input
type="submit" value="Add to Shelf"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;" /></form>
-
-<form><input type="submit" onclick="addRecord('<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag"
/></form>
-</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl 22 Nov 2006 15:47:30 -0000
1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl 7 Dec 2006 15:42:15 -0000
1.1.2.5
@@ -1,22 +1,16 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
+<!-- TMPL_IF NAME="loggedinusername" -->
+<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+<!-- /TMPL_IF -->
<div id="opac-main-search">
- <!-- TMPL_IF NAME="loggedinusername" -->
- <!-- TMPL_ELSE -->
- <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth"
id="auth">
- <h3>Log in to Check Your Account</h3>
- <p><label for="userid">Card Number:</label><input type="text" id="userid"
size="10" name="userid" /></p>
- <p><label for="password">Password:</label> <input type="password"
id="password" size="10" name="password" /></p>
- <p><input type="submit" value="Log In" class="submit" /></p>
- </form>
- <!-- /TMPL_IF -->
-
- <form name="searchform" method="get" action="opac-search.pl"
id="searchform">
+ <form name="searchform" method="POST"
action="/cgi-bin/koha/opac-search.pl" id="searchform">
<p>
<label for="masthead_search">Search</label>
<select name="idx" id="masthead_search">
@@ -31,7 +25,7 @@
<option value="callnum">Call Number</option>
</select>
<input type="text" name="q" style="width: 30%;"/>
- <input type="submit" value="Search" class="submit" /> <a
href="opac-search.pl">Advanced Search</a></p>
+ <input type="submit" value="Search" class="submit" /> <a
href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></p>
</form>
</div>
@@ -54,24 +48,8 @@
</p>
</form>
</div>
-
-<!-- TMPL_IF NAME="loggedinusername" -->
-<div id="opac-main-loggedin">
-<h3>You're logged in as <em><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR
NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></em> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a>
if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" -->
<!-- TMPL_VAR NAME="surname" -->)<!-- /TMPL_LOOP --></h3>
-
-<ul><li><a href="/cgi-bin/koha/opac-user.pl">my library home</a> </li> <li> <a
href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li>
- <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>
</li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a>
<!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a
href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF
--> <!-- TMPL_IF name="virtualshelves" --> </li> <li> <a
href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!--
/TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a
href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF
--></li></ul>
- <!-- TMPL_IF name="textmessaging"-->
- <h3>Message from the library</h3>
- <p class="error"><!-- TMPL_VAR name="textmessaging"
--></p>
- <!-- /TMPL_IF -->
-<form method="post" action="/cgi-bin/koha/opac-logout.pl">
-<p><input type="submit" class="submit" name="logout" value="Log Out" /></p>
-</form>
-</div><!-- /TMPL_IF -->
-
<!-- TMPL_IF NAME="opaclanguagesdisplay" -->
- <div class="content-block">
+<div class="content-block">
<h4 class="inline">Change Language:</h3>
<form action="/cgi-bin/koha/changelanguage.pl" method="post"
class="inline">
<select name="language">
@@ -81,7 +59,7 @@
</select>
<input type="submit" value="Switch" class="submit">
</form>
- </div>
-<!-- /TMPL_IF -->
</div>
+<!-- /TMPL_IF -->
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.4
@@ -1,122 +1,132 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- MARC Details for Record No. <!--
TMPL_VAR name="biblionumber" -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
<h2>MARC View</h2>
-<!-- TMPL_UNLESS NAME="norequests" -->
- <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
- <input type="submit" name="submit" VALUE="Place Reserve" />
- <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->" />
- </form>
-<!-- /TMPL_UNLESS -->
-<!-- Hide from NPL --><form action="opac-ISBDdetail.pl" method="get"><input
type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"
/><input type="submit" value="ISBD" /></form><!-- /Hide from NPL -->
-
-<form action="opac-detail.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" value="Normal View" /></form>
-
-<form action="opac-detailprint.pl" method="get"><input type="hidden"
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" value="Print"
onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
name="biblionumber" -->'); return false;"/></form>
-<!-- TMPL_IF name="virtualshelves" --><form
action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input
type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"
/><input type="submit" value="Add to My Book List"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
-
-<form><input type="submit" onclick="addRecord('<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag"
/></form>
+<div id="action">
+ <!-- TMPL_UNLESS NAME="norequests" -->
+ <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Place Reserve
+ </a>
+ <!-- /TMPL_UNLESS -->
+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Normal View
+ </a>
+ <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ ISBD
+ </a>
+ <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->'); return false;">
+ Print
+ </a>
+ <!-- TMPL_IF name="virtualshelves" -->
+ <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;">
+ Add to My Book List
+ </a>
+ <!-- /TMPL_IF -->
+ <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->');
return false;">
+ Add to My Book Bag
+ </a>
+</div>
- <table><!-- TMPL_LOOP name="0XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
- <!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <table style="border:0px;">
+ <!-- TMPL_LOOP name="0XX" -->
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
+ <!-- TMPL_LOOP name="subfield" -->
+ <tr><td style="border:0px;"> </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
-
<!-- TMPL_LOOP name="1XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="2XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="3XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="4XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><!-- TMPL_VAR name="tag"
--></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="5XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="6XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;"><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;"> </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="7XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="8XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP name="9XX" -->
- <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag"
--></td></tr>
+ <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag"
--></b></td></tr>
<!-- TMPL_LOOP name="subfield" -->
- <tr><td class="marcsubfieldletter"><!--
TMPL_VAR name="marc_subfield" --></td>
- <td class="marcsubfieldname"><!--
TMPL_VAR name="marc_lib" --></td>
- <td class="subfieldvalue"><!-- TMPL_VAR
name="marc_value" --></td>
+ <tr><td style="border:0px;" > </td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib"
--></td>
+ <td style="border:0px;" ><!-- TMPL_VAR name="marc_value"
--></td>
</tr>
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
@@ -126,9 +136,9 @@
<table>
<tr>
<!-- TMPL_LOOP name="item_header_loop"
-->
- <th>
+ <tr>
<!-- TMPL_VAR
name="header_value" -->
- </th>
+ </tr>
<!-- /TMPL_LOOP -->
</tr>
<!-- TMPL_LOOP name="item_loop" -->
@@ -139,5 +149,4 @@
</table><!-- TMPL_ELSE -->
<p>No copies available.</p>
<!-- /TMPL_IF -->
-</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -4,8 +4,6 @@
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!--CONTENT-->
-
-<div id="main">
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF NAME= "Error_messages" -->
@@ -42,5 +40,4 @@
<!-- /TMPL_IF -->
</form>
-</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.4
@@ -4,8 +4,6 @@
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!--CONTENT-->
-
-<div id="main">
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h3>Reading History of <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h3>
@@ -17,7 +15,8 @@
<tr><td colspan="4">Showing All Items | <a
href="opac-readingrecord.pl?limit=">Show Last 50 Items Only</a></td></tr><!--
TMPL_ELSE -->
<tr><td colspan="4">Showing Last 50 Items | <a
href="opac-readingrecord.pl?limit=full">Show All Items</a></td></tr>
<!-- /TMPL_IF --><tr>
-<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a
href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE
--> <!-- /TMPL_UNLESS NAME="orderbyauthor"--></th>
+<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a
href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE
-->
+ <!-- /TMPL_UNLESS --></th>
<th><!-- TMPL_UNLESS --><a
href="/cgi-bin/koha/opac-readingrecord.pl?order=author">Author</a><!--
TMPL_ELSE --> <!-- /TMPL_UNLESS --></th>
<th><!-- TMPL_UNLESS NAME="orderbydate" --><a
href="/cgi-bin/koha/opac-readingrecord.pl">Date</a><!-- TMPL_ELSE -->Date<!--
/TMPL_UNLESS --></th></tr>
@@ -34,5 +33,4 @@
<!-- /TMPL_UNLESS -->
-</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -1,11 +1,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" -->
for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!--
TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!--CONTENT-->
<!-- TMPL_IF NAME="message" -->
-<div id="main">
<!-- TMPL_IF NAME="GNA" --><p class="error"><strong>Sorry</strong>, you cannot
place reserves because the library doesn't have up-to-date <a
href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.
</p><p class="error">Please contact your librarian, or use the <a
href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit
current information (<em>Please note:</em> there may be a delay in restoring
your account if you submit online)</p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="lost" --><p class="error"><strong>Sorry</strong>, you
cannot place reserves because your library card has been marked as lost or
stolen. </p><p class="error"> If this is an error, please take your card to the
circulation desk at your local library and the error will be corrected.</p><!--
/TMPL_IF -->
<!-- TMPL_IF NAME="debarred" --><p class="error"><strong>Sorry</strong>, you
cannot place reserves because your account has been frozen.</p><p
class="error">Usually the reason for freezing an account is old overdues or
damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a>
shows your account to be clear, please consult a librarian.</p><!-- /TMPL_IF -->
@@ -21,7 +20,6 @@
<!-- TMPL_IF NAME="select_item_types" -->
<!-- The first time round you select which bibitems you want -->
-<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="item_types_selected" value="1">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->">
@@ -40,7 +38,7 @@
<!-- TMPL_IF NAME="onlyone" -->
<!-- If there is only one type -->
-</div><p><input type="submit" class="submit" value="Next >>">
+<p><input type="submit" class="submit" value="Next >>">
<input type="hidden" name="all" value="1"></p>
</form>
@@ -48,8 +46,10 @@
<!-- If there is more than one type -->
<h4>Choose Either...</h4>
- <p><input class="checkbox" type="checkbox" name="all"
value="next-available">
- Next Available Copy (any format)</p>
+ <p>
+ <input id="checknextavailable" type="checkbox" name="all"
value="next-available">
+ <label for="checknextavailable">Next Available Copy (any
format)</label>
+ </p>
<h4>
...Or Choose Acceptable Formats
</h4>
@@ -69,7 +69,6 @@
</div>
<p><input type="submit" class="submit" value="Confirm Reservation
>>"></p>
</form>
-</div>
<!-- /TMPL_IF -->
@@ -78,7 +77,6 @@
<!-- TMPL_IF NAME="item_types_selected" -->
<!-- if the bibitems have already been selected -->
-<div id="main">
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
<input type="hidden" name="place_reserve" value="1">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
@@ -102,6 +100,5 @@
</FORM>
<!-- /TMPL_IF -->
-</div>
</body>
</html>
\ No newline at end of file
Index: koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.5
+++ koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.6
@@ -1,34 +1,73 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- <!-- TMPL_IF NAME="searchdesc"
-->Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'<!-- TMPL_ELSE
-->You did not specify any search criteria<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close-results.inc" -->
-<body id="withnav">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" -->
+
+<!-- TMPL_IF NAME="searchdesc" -->
+ Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'
+<!-- TMPL_ELSE -->
+ You did not specify any search criteria
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<div id="main_wrapper">
-<div id="main" class="searchresults">
-<div class="content-block">
-<!-- TMPL_IF NAME="koha_spsuggest" --><div style="font-size: 12px;">Did you
mean: <ul style="list-style: none;"><!-- TMPL_LOOP NAME="SPELL_SUGGEST" -->
<li><a href="opac-search.pl?q=<!-- TMPL_VAR NAME="spsuggestion" -->"><!--
TMPL_VAR NAME="spsuggestion" --></a></li><!-- /TMPL_LOOP --></ul></div><!--
/TMPL_IF -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+
+<!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- TMPL_INCLUDE NAME="usermenu.inc" -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="koha_spsuggest" -->
+<div style="font-size: 12px;">Did you mean:
+ <ul style="list-style: none;">
+ <!-- TMPL_LOOP NAME="SPELL_SUGGEST" -->
+ <li>
+ <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR
NAME="spsuggestion" -->"><!-- TMPL_VAR NAME="spsuggestion" --></a>
+ </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+</div>
+<!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="total" -->
-<!-- TMPL_VAR NAME="total" --> results found.
+<h3><!-- TMPL_VAR NAME="total" --> results found.</h3>
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="searchdesc" -->
-No results match your search for <span style="font-weight: bold;">“<!--
TMPL_VAR NAME="searchdesc" -->”</span> in <!-- TMPL_VAR
NAME="LibraryName" --> Catalog.
+<h3> No Result found !</h3>
+<p>
+ No results match your search for <span style="font-weight:
bold;">“<!-- TMPL_VAR NAME="searchdesc" -->”</span> in <!--
TMPL_VAR NAME="LibraryName" --> Catalog.
+</p>
+<a href="/cgi-bin/koha/opac-search.pl" title="New search">Perform a new
search</a>
<!-- TMPL_ELSE -->
-You did not specify any search criteria.
+<h3> No result found !</h3>
+<p>
+ You did not specify any search criteria.
+</p>
+<a href="/cgi-bin/koha/opac-search.pl" title="New search">Perform a new
search</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="query_error" -->
-<!-- TMPL_VAR NAME="query_error" -->
+<br /><br />
+Error :
+<span class="problem">
+ <!-- TMPL_VAR NAME="query_error" -->
+</span>
<!-- /TMPL_IF -->
<!-- Search Results Table -->
<!-- TMPL_IF NAME="total" -->
<!-- TMPL_IF NAME="scan" -->
<h1>Scan Index:</h1>
- <form action="opac-serach.pl" method="get">
-<table>
- <tr><td>
+<form action="/cgi-bin/koha/opac-search.pl" method="POST">
+ <table>
+ <tr>
+ <td>
Scan Index for: <input type="text" name="qf" id="scan-index" size="35"
value="" />
</td>
- </tr><tr><td>
+ </tr>
+ <tr>
+ <td>
<label for="scan-index">Indexed in:</label>
<select name="idx" id="scan-index">
<option value="">Any Word</option>
@@ -46,96 +85,219 @@
<option value="ss:">ISSN</option>
</select>
<input type="hidden" name="scan" value="1" />
-</td></tr>
-</table>
+ </td>
+ </tr>
+ </table>
</form>
-<form action="opac-search.pl" method="get">
-<table>
+<form action="/cgi-bin/koha/opac-search.pl" method="POST">
+ <table>
<tr>
<th>Term/Phrase</th>
<th>Count</th>
</tr>
-<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-
- <tr<!-- TMPL_IF name="even" --> class="highlight"<!--
/TMPL_IF -->><td>
- <a href="opac-search.pl?q=<!-- TMPL_VAR
NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title"
-->""><!-- TMPL_VAR NAME="title" --></a>
+ <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+ <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+ <td>
+ <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR
NAME="scan_use" escape="url" -->"<!-- TMPL_VAR NAME="title"
-->""><!-- TMPL_VAR NAME="title" --></a>
</td>
<td>
<!-- TMPL_VAR NAME="subtitle" -->
- </td></tr>
-<!-- /TMPL_LOOP -->
-
-</table>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
</form>
<!-- TMPL_ELSE -->
-<form action="opac-search.pl" method="get" name="myform" id="mainform">
-
-<!--TMPL_IF NAME="opacbookbag" --><a href="#" onclick="CheckAll(); return
false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif"
height="18" width="18" alt="Check All" title="Check All" border="0" /></a><!--
TMPL_ELSE --> <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="opacbookbag" -->
-<input type="submit" class="icon addchecked" value="Add Checked Items to Book
Bag" onclick="addMultiple(); return false;" /> <input type="reset" value="Clear
All" class="icon clearall" /><!-- /TMPL_IF -->
+<form action="/cgi-bin/koha/opac-search.pl" method="POST" name="myform"
id="mainform">
<!-- TMPL_IF NAME="searchdesc" -->
<input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc"
escape="html" -->" />
<!-- /TMPL_IF -->
+ <div class="searchresults">
+
+ <!-- RE-SORT START -->
<!-- TMPL_IF NAME="sort_by_loop" -->
- <p><select id="sort_by" name="sort_by"
onChange="document.myform.submit();">
+ <p>
+ Re-sort results
+ <select id="sort_by" name="sort_by"
onChange="document.myform.submit();">
<option value="">Field-weighted, Relevance Ranked</option>
<!-- TMPL_LOOP NAME="sort_by_loop" -->
<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF
NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF
-->><!-- TMPL_VAR NAME="label" --></option>
<!-- /TMPL_LOOP -->
</select>
- <input type="submit" value="Re-sort" class="submit" />
- <a href="http://wiki.koha.org/?id=en:opachelp#sort_by"; class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a></p>
+ <a href="http://wiki.koha.org/?id=en:opachelp#sort_by";
class="help"
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By
Help','width=350,top=50,left=50,resizable,scrollbars,height=650'); return
false;">[ ? ]</a>
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- RESORT END -->
+
+ <!-- ######### -->
+
+ <!-- FACETS START -->
+ <!-- TMPL_IF NAME="opacfacets" -->
+ <div id="facets" style="display:inline;" >
+ <h2>Refine Your Search</h2>
+ <ul>
+ <!-- TMPL_LOOP NAME="facets_loop" -->
+ <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR
NAME="type_label" -->
+ <ul>
+ <!-- TMPL_LOOP NAME="facets" -->
+ <li>
+ <a href="/cgi-bin/koha/opac-search.pl?q=<!--
TMPL_VAR NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value"
-->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR
NAME="facet_title_value" -->">
+ <!-- TMPL_VAR NAME="facet_label_value" -->
+ </a> (<!-- TMPL_VAR NAME="facet_count" -->)
+ </li>
+ <!-- /TMPL_LOOP -->
+ <!-- TMPL_IF NAME="expandable" -->
+ <li class="showmore">
+ <a href="/cgi-bin/koha/opac-search.pl?q=<!--
TMPL_VAR NAME="searchdesc" -->&expand=<!-- TMPL_VAR NAME="expand" -->#<!--
TMPL_VAR NAME="type_id" -->">
+ Show More
+ </a>
+ </li>
+ <!-- /TMPL_IF -->
+ </ul>
+ </li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ </div>
<!-- /TMPL_IF -->
+ <!-- FACETS END -->
-<table>
+ <!-- ######### -->
+
+ <!-- TABLE RESULTS START -->
+
+ <table>
+ <tr>
+ <th> </th>
+ <th>Title</th>
+ <th>Call No.</th>
+ <th>Location</th>
+ <th> </th>
+ </tr>
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
- <!-- TMPL_IF name="even" --><tr class="highlight"><!--
TMPL_ELSE --><tr><!-- /TMPL_IF -->
- <td><!-- TMPL_IF NAME="AmazonContent" --><a class="p1"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn"
-->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn"
-->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE
-->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!--
/TMPL_IF -->" alt="image" class="thumbnail" /></a><!-- /TMPL_IF --></td>
- <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a
class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF
name="BiblioDefaultViewisbd" --><a class="title"
href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF
NAME="author" -->by <a href="opac-search.pl?do=search&q=au:<!-- TMPL_VAR
NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!--
TMPL_ELSE --> <!-- /TMPL_IF -->
- <p> <!-- TMPL_IF name="publicationyear" --> -
<!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="even" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
+ <tr>
+ <!-- /TMPL_IF -->
+ <td>
+ <!-- TMPL_IF NAME="AmazonContent" -->
+ <a class="p1"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <img src="<!-- TMPL_IF NAME="isbn"
-->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn"
-->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE
-->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!--
/TMPL_IF -->" alt="image" class="thumbnail" />
+ </a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="imageurl" -->
+ <img src="<!-- TMPL_VAR name="imageurl" -->"
title="<!-- TMPL_VAR name="description" -->"/>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_VAR name="description" -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </td>
+ <td>
+ <p>
+ <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+ <a class="title"
href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+ <a class="title"
href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <a class="title"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR
NAME="subtitle" -->
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </p>
+ <!-- TMPL_IF name="summary" -->
+ <p><!-- TMPL_VAR name="summary" --></p>
+ <!-- TMPL_ELSE -->
+ <p>
+ <!-- TMPL_IF NAME="author" -->
+ <a href="/cgi-bin/koha/opac-search.pl?q=au:<!--
TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a>
+ <!-- TMPL_ELSE -->
+
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publicationyear" --> - <!--
TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
<!-- TMPL_IF
name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF
-->
<!-- TMPL_IF name="place" --> ;
<!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" --> -
<!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --> :
<!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="size" --> ;
<!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="timestamp"
--> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF --></p>
- <p class="availability">
-<!-- TMPL_IF NAME="items_loop" -->
-<span class="available"><strong>Copies available at:</strong> <!-- TMPL_LOOP
NAME="items_loop" -->
+ <!-- TMPL_IF name="timestamp" --> <i>(modified on
<!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
+ </p>
+ <!-- /TMPL_IF -->
+ </td>
+ <td>
+ <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!--
TMPL_VAR NAME="classification" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="classification" -->
+ </a>
+ </td>
+ <td style="white-space: nowrap">
+ <!-- TMPL_IF NAME="items_loop" -->
+ <span class="available">
+ <!-- TMPL_LOOP NAME="items_loop" -->
<!-- <!-- TMPL_VAR NAME="branchcode" --> -->
<!-- TMPL_VAR NAME="branchname" -->
- (<!-- TMPL_VAR NAME="count" -->),
-<!-- /TMPL_LOOP --></span>
-<!-- TMPL_ELSE -->
-<span class="unavailable">No copies available: </span>
-<!-- /TMPL_IF -->
-<span class="unavailable">
-<!-- TMPL_IF NAME="onloancount" --> On loan (<!-- TMPL_VAR NAME="onloancount"
-->), <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn (<!-- TMPL_VAR
NAME="wthdrawncount" -->), <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount"
-->)<!-- /TMPL_IF --></span>
- </p>
- <p><!-- TMPL_UNLESS NAME="norequests" --><!--
TMPL_IF NAME="opacuserlogin" --><a class="reserve"
href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">Place Reserve</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS
--> <!--TMPL_IF NAME="opacbookbag" --><input type="checkbox"
name="biblionumber" id="biblionumber<!-- TMPL_VAR NAME="biblionumber" -->"
value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!--
TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--TMPL_IF
NAME="opacbookbag" --></label><!-- /TMPL_IF --><a
href="opac-search.pl?do=search&q=callnum:<!-- TMPL_VAR
NAME="classification" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="classification"
--></a></p>
+ (<!-- TMPL_VAR NAME="count" -->
+ <!-- TMPL_IF name="itemcallnumber" --> <i><!--
TMPL_VAR name="itemcallnumber" --></i><!-- /TMPL_IF -->
+ ),<br />
+ <!-- /TMPL_LOOP -->
+ </span>
+ <!-- /TMPL_IF -->
+ <span class="unavailable">
+ <!-- TMPL_IF NAME="onloancount" --> On loan (<!--
TMPL_VAR NAME="onloancount" -->),<br /> <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn
(<!-- TMPL_VAR NAME="wthdrawncount" -->),<br /> <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="itemlostcount" --> Lost (<!--
TMPL_VAR NAME="itemlostcount" -->)<br /><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="orderedcount" --> On order
(<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF -->
+ </span>
+ </td>
+ <td>
+ <!-- TMPL_IF NAME="norequests" -->
+ Not Reserveable
+ <!-- TMPL_ELSE -->
+ <a class="reserve"
href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->">
+ Reserves
+ </a>
+ <!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
-</form>
-<!-- /TMPL_IF -->
+ </div>
+ </form>
+ <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="PAGE_NUMBERS" --><div class="pages">
+ <!-- TMPL_IF NAME="PAGE_NUMBERS" -->
+ <div class="pages">
<!-- Row of numbers corresponding to search result pages -->
- <!-- TMPL_IF NAME="previous_page_offset" --><a class="nav"
href="opac-search.pl?do=search&q=<!-- TMPL_VAR NAME="searchdesc"
-->&offset=<!-- TMPL_VAR NAME="previous_page_offset" -->"><<
Previous</a><!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME="PAGE_NUMBERS" --><!-- TMPL_IF NAME="highlight"
--><span class="current"><!-- TMPL_VAR NAME="pg" --></span><!-- TMPL_ELSE -->
- <a class="nav" href="opac-search.pl?do=search&q=<!-- TMPL_VAR
NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF
NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF
-->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="previous_page_offset" -->
+ <a class="nav" href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR
NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="previous_page_offset" -->">
+ << Previous
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP NAME="PAGE_NUMBERS" -->
+ <!-- TMPL_IF NAME="highlight" -->
+ <span class="current"><!-- TMPL_VAR NAME="pg" --></span>
+ <!-- TMPL_ELSE -->
+ <a class="nav" href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR
NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF
NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF
-->">
+ <!-- TMPL_VAR NAME="pg" -->
+ </a>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME="next_page_offset" --><a class="nav"
href="opac-search.pl?do=search&q=<!-- TMPL_VAR NAME="searchdesc"
-->&offset=<!-- TMPL_VAR NAME="next_page_offset" -->">Next >></a><!--
/TMPL_IF -->
-</div><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="next_page_offset" -->
+ <a class="nav" href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR
NAME="searchdesc" -->&offset=<!-- TMPL_VAR NAME="next_page_offset" -->">
+ Next >>
+ </a>
+ <!-- /TMPL_IF -->
+ </div>
+ <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="outer_sup_results_loop" -->
<h3><!-- TMPL_LOOP NAME="outer_sup_results_loop" --></h3>
@@ -148,16 +310,11 @@
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
+ <!-- TMPL_ELSE -->
-<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
-<!-- TMPL_IF name="suggestion" -->
-<div class="note">Not finding what you're looking for?<br /> Make a <a
href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div>
-<!-- /TMPL_IF -->
-</div>
</div>
</div>
-<!-- TMPL_INCLUDE NAME="opac-facets.inc" -->
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -2,10 +2,7 @@
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
-
-<ul><li> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li>
<li>
- <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>
<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a
href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF
--><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a
href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF
--> <!-- TMPL_IF name="virtualshelves" --> </li> <li> <a
href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!--
/TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a
href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF
--></li></ul>
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF Name="viewshelf" -->
@@ -133,7 +130,7 @@
<!-- /TMPL_IF -->
<br clear="both" />
-</div>
+
</body>
</html>
Index: koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -5,7 +5,6 @@
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF name="op_add" -->
<h1>Enter a new purchase suggestion</h1>
@@ -147,6 +146,4 @@
<input type="submit" value="Enter a new purchase suggestion" />
</form>
<!-- /TMPL_IF -->
-</div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.4
@@ -3,14 +3,12 @@
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
-
<!--CONTENT-->
-<div id="main">
+
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --></h2>
-
<table>
<tr><th scope="row">Name:</th><td> <!-- TMPL_VAR NAME="firstname" --> <!--
TMPL_VAR NAME="surname" --></td></tr>
<tr><th scope="row">
@@ -78,6 +76,5 @@
<input type="submit" name="Modify" value="Modify Your Record" />
</form>
-</div>
</body>
</html>
\ No newline at end of file
Index: koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl 22 Nov 2006 15:47:30 -0000
1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl 7 Dec 2006 15:42:15 -0000
1.1.2.5
@@ -1,14 +1,19 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Library Home for <!-- TMPL_LOOP
name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR
name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Library Home for
+<!-- TMPL_LOOP name="BORROWER_INFO" -->
+ <!-- TMPL_VAR name="firstname" --><!-- TMPL_VAR name="surname" -->
+<!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
<!-- CONTENT -->
-<div id="main">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
- <h2>
- Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" --> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if
you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" -->
<!-- TMPL_VAR NAME="surname" -->)
+ <h2 style="display:inline;">
+ Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" -->
</h2>
+ (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not
<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR
NAME="surname" -->)
+ <br /><br />
<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_IF name="textmessaging"-->
<h3>Message from the library</h3>
@@ -93,9 +98,7 @@
<th>Renew</th>
<th>Fines</th>
</tr>
-
<!-- TMPL_LOOP NAME="ISSUES" -->
-
<!-- TMPL_IF NAME="overdue" -->
<tr class="overdue">
<!-- TMPL_ELSE -->
@@ -147,7 +150,7 @@
<!-- TMPL_LOOP NAME="RESERVES" -->
<tr>
<td>
- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="reserves_title" --></a>
<!-- TMPL_VAR NAME="author" -->
</td>
<td><!-- TMPL_VAR NAME="reservedate" --></td>
@@ -159,5 +162,5 @@
</table>
<p>If you no longer want a reserve, please send us an e-mail, or go to
the circulation desk at your library to get it removed.</p>
<!-- /TMPL_IF -->
-</div>
+
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl 7 Dec 2006 15:42:15
-0000 1.1.2.3
@@ -3,8 +3,7 @@
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="navigation.inc" -->
-<div id="main">
- <!-- TMPL_INCLUDE name="usermenu.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
<!-- TMPL_LOOP name="BORROWER_INFO" -->
<h3>Updating Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR
name="surname" --></h3>
<p>Please make any necessary changes to your record. Submitting the form will
notify a library staff member, who will make the changes permanent.</p>
@@ -29,8 +28,7 @@
<p><input type="submit" value="Submit Changes"></p>
</form>
-
<!-- /TMPL_LOOP -->
-</div>
+
</body>
</html>
Index: opac/changelanguage.pl
===================================================================
RCS file: /sources/koha/koha/opac/changelanguage.pl,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -b -r1.1 -r1.1.8.1
--- opac/changelanguage.pl 16 Aug 2004 12:49:42 -0000 1.1
+++ opac/changelanguage.pl 7 Dec 2006 15:42:15 -0000 1.1.8.1
@@ -3,8 +3,8 @@
use C4::Output;
use CGI;
-my $query=new CGI;
-my $language=$query->param('language');
-my $url=$query->referer();
+my $query = new CGI;
+my $language = $query->param('language');
+my $url = $query->referer();
-setlanguagecookie($query,$language,$url);
+setlanguagecookie( $query, $language, $url );
Index: opac/opac-account.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-account.pl,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- opac/opac-account.pl 20 Nov 2006 11:01:33 -0000 1.11.2.1
+++ opac/opac-account.pl 7 Dec 2006 15:42:15 -0000 1.11.2.2
@@ -29,38 +29,42 @@
use C4::Date;
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-account.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-account.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
my @bordat;
$bordat[0] = $borr;
$template->param( BORROWER_INFO => address@hidden );
-
#get account details
-my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
+my ( $numaccts, $accts, $total ) = getboracctrecord( undef, $borr );
-for (my $i=0;$i<$numaccts;$i++){
- $accts->[$i]{'date'} = format_date($accts->[$i]{'date'});
- $accts->[$i]{'amount'} = sprintf("%.2f", $accts->[$i]{'amount'});
- if($accts->[$i]{'amount'} >= 0){
+for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
+ $accts->[$i]{'date'} = format_date( $accts->[$i]{'date'} );
+ $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} );
+ if ( $accts->[$i]{'amount'} >= 0 ) {
$accts->[$i]{'amountcredit'} = 1;
}
- $accts->[$i]{'amountoutstanding'} =sprintf("%.2f",
$accts->[$i]{'amountoutstanding'});
- if($accts->[$i]{'amountoutstanding'} >= 0){
+ $accts->[$i]{'amountoutstanding'} =
+ sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} );
+ if ( $accts->[$i]{'amountoutstanding'} >= 0 ) {
$accts->[$i]{'amountoutstandingcredit'} = 1;
}
- if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne
'FU'){
+ if ( $accts->[$i]{'accounttype'} ne 'F'
+ && $accts->[$i]{'accounttype'} ne 'FU' )
+ {
$accts->[$i]{'print_title'};
}
}
@@ -73,11 +77,9 @@
$num++;
}
+$template->param( ACCOUNT_LINES => $accts, );
-$template->param( ACCOUNT_LINES => $accts,
-);
-
-$template->param( total => sprintf("%.2f",$total) );
+$template->param( total => sprintf( "%.2f", $total ) );
#$template->param(loggeninuser => $loggedinuser);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- opac/opac-addbookbybiblionumber.pl 5 Dec 2006 11:35:31 -0000 1.5.2.2
+++ opac/opac-addbookbybiblionumber.pl 7 Dec 2006 15:42:15 -0000 1.5.2.3
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.5.2.2
2006/12/05 11:35:31 toins Exp $
+# $Header: /sources/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.5.2.3
2006/12/07 15:42:15 toins Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -38,43 +38,52 @@
my $newbookshelf = $query->param('newbookshelf');
my $category = $query->param('category');
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "opac-addbookbybiblionumber.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-addbookbybiblionumber.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- });
+ }
+);
my $x; # for trash
-($x,$x,$shelfnumber) = AddShelf('',$newbookshelf,$loggedinuser,$category) if
$newbookshelf;
+( $x, $x, $shelfnumber ) =
+ AddShelf( '', $newbookshelf, $loggedinuser, $category )
+ if $newbookshelf;
if ($shelfnumber) {
- &AddToShelfFromBiblio($env, $biblionumber, $shelfnumber);
- print "Content-Type: text/html\n\n<html><body
onload=\"window.close()\"></body></html>";
+ &AddToShelfFromBiblio( $env, $biblionumber, $shelfnumber );
+ print
+"Content-Type: text/html\n\n<html><body
onload=\"window.close()\"></body></html>";
exit;
-} else {
+}
+else {
my ( $bibliocount, @biblios ) = GetBiblio($biblionumber);
- my ($shelflist) = GetShelfList($loggedinuser,3);
+ my ($shelflist) = GetShelves( $loggedinuser, 3 );
my @shelvesloop;
my %shelvesloop;
- foreach my $element (sort keys %$shelflist) {
- push (@shelvesloop, $element);
+ foreach my $element ( sort keys %$shelflist ) {
+ push( @shelvesloop, $element );
$shelvesloop{$element} = $shelflist->{$element}->{'shelfname'};
}
my $CGIbookshelves;
- if (@shelvesloop > 0){
- $CGIbookshelves=CGI::scrolling_list( -name => 'shelfnumber',
+ if ( @shelvesloop > 0 ) {
+ $CGIbookshelves = CGI::scrolling_list(
+ -name => 'shelfnumber',
-values => address@hidden,
-labels => \%shelvesloop,
-size => 1,
- -tabindex=>'',
- -multiple => 0 );
+ -tabindex => '',
+ -multiple => 0
+ );
}
- $template->param(biblionumber => $biblionumber,
+ $template->param(
+ biblionumber => $biblionumber,
title => $biblios[0]->{'title'},
author => $biblios[0]->{'author'},
CGIbookshelves => $CGIbookshelves,
@@ -90,7 +99,13 @@
output_html_with_http_headers $query, $cookie, $template->output;
}
+
# $Log: opac-addbookbybiblionumber.pl,v $
+# Revision 1.5.2.3 2006/12/07 15:42:15 toins
+# synching opac & intranet.
+# fix some broken link & bugs.
+# removing warn compilation.
+#
# Revision 1.5.2.2 2006/12/05 11:35:31 toins
# Biblio.pm cleaned.
# additionalauthors, bibliosubject, bibliosubtitle tables are now unused.
@@ -108,28 +123,4 @@
# Revision 1.1.2.6 2006/04/27 16:23:34 oleonard
# Hiding option to add to existing virtual shelves if there are no existing
virtual shelves (thanks Chris!)
#
-# Revision 1.1.2.5 2006/03/01 22:33:25 oleonard
-# Enabling several new system preferences: opacreadinghistory,
opaccolorstylesheet, opaclanguagesdisplay, opaclayoutstylesheet, opacsmallimage
-#
-# Revision 1.1.2.4 2006/02/04 16:47:21 kados
-# Adding support for opaccredits to opac scripts
-#
-# Revision 1.1.2.3 2006/02/03 21:03:57 kados
-# Updating script for new system preference: OpacNav
-# ----------------------------------------------------------------------
-#
-# 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 :
-# * The user does not need to have to have librarian rights to use virtual
shelves
-# * error when adding a biblio to an existing basket
-#
-# Revision 1.1 2005/01/03 11:09:59 tipaul
-# *** empty log message ***
-#
-# Local Variables:
-# tab-width: 4
-# End:
Index: opac/opac-alert-subscribe.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-alert-subscribe.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- opac/opac-alert-subscribe.pl 30 Nov 2006 18:23:51 -0000 1.2.2.1
+++ opac/opac-alert-subscribe.pl 7 Dec 2006 15:42:15 -0000 1.2.2.2
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-alert-subscribe.pl,v 1.2.2.1 2006/11/30 18:23:51 toins Exp $
+# $Id: opac-alert-subscribe.pl,v 1.2.2.2 2006/12/07 15:42:15 toins Exp $
use strict;
use CGI;
@@ -36,45 +36,54 @@
my $dbh = C4::Context->dbh;
my $sth;
-my ($template, $loggedinuser, $cookie);
+my ( $template, $loggedinuser, $cookie );
my $externalid = $query->param('externalid');
my $alerttype = $query->param('alerttype');
my $biblionumber = $query->param('biblionumber');
-($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "opac-alert-subscribe.tmpl",
+( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-alert-subscribe.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+);
-if ($op eq 'alert_confirmed') {
- addalert($loggedinuser,$alerttype,$externalid);
- if ($alerttype eq 'issue') {
- print
$query->redirect("opac-serial-issues.pl?biblionumber=$biblionumber");
+if ( $op eq 'alert_confirmed' ) {
+ addalert( $loggedinuser, $alerttype, $externalid );
+ if ( $alerttype eq 'issue' ) {
+ print $query->redirect(
+ "opac-serial-issues.pl?biblionumber=$biblionumber");
exit;
}
-} elsif ($op eq 'cancel_confirmed') {
- my $alerts =getalert($loggedinuser,$alerttype,$externalid);
- foreach (@$alerts) { # we are supposed to have only 1 result, but just
in case...
- delalert($_->{alertid});
+}
+elsif ( $op eq 'cancel_confirmed' ) {
+ my $alerts = getalert( $loggedinuser, $alerttype, $externalid );
+ foreach (@$alerts)
+ { # we are supposed to have only 1 result, but just in case...
+ delalert( $_->{alertid} );
}
- if ($alerttype eq 'issue') {
- print
$query->redirect("opac-serial-issues.pl?biblionumber=$biblionumber");
+ if ( $alerttype eq 'issue' ) {
+ print $query->redirect(
+ "opac-serial-issues.pl?biblionumber=$biblionumber");
exit;
}
-} else {
- if ($alerttype eq 'issue') { # alert for subscription issues
+}
+else {
+ if ( $alerttype eq 'issue' ) { # alert for subscription issues
my $subscription = &GetSubscription($externalid);
- $template->param("typeissue$op" => 1,
+ $template->param(
+ "typeissue$op" => 1,
bibliotitle =>
$subscription->{bibliotitle},
notes => $subscription->{notes},
externalid => $externalid,
biblionumber => $biblionumber,
);
- } else {
+ }
+ else {
}
}
Index: opac/opac-authoritiesdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authoritiesdetail.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- opac/opac-authoritiesdetail.pl 30 Nov 2006 18:23:51 -0000 1.1.4.2
+++ opac/opac-authoritiesdetail.pl 7 Dec 2006 15:42:15 -0000 1.1.4.3
@@ -37,7 +37,6 @@
=cut
-
use strict;
require Exporter;
use C4::AuthoritiesMarc;
@@ -50,123 +49,143 @@
use C4::Koha;
use HTML::Template;
-my $query=new CGI;
+my $query = new CGI;
-my $dbh=C4::Context->dbh;
+my $dbh = C4::Context->dbh;
my $authid = $query->param('authid');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+my $authtypecode = &AUTHfind_authtypecode( $dbh, $authid );
+my $tagslib = &AUTHgettagslib( $dbh, 1, $authtypecode );
# open template
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-authoritiesdetail.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-authoritiesdetail.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+);
my $record;
-if (C4::Context->preference("AuthDisplayHierarchy")){
- my $trees=BuildUnimarcHierarchies($authid);
-# warn "trees :$trees";
- my @trees = split /;/,$trees ;
- push @trees,$trees unless (@trees);
+if ( C4::Context->preference("AuthDisplayHierarchy") ) {
+ my $trees = BuildUnimarcHierarchies($authid);
+
+ # warn "trees :$trees";
+ my @trees = split /;/, $trees;
+ push @trees, $trees unless (@trees);
my @loophierarchies;
- foreach my $tree (@trees){
-# warn "tree :$tree";
+ foreach my $tree (@trees) {
+
+ # warn "tree :$tree";
- my @tree=split /,/,$tree;
- push @tree,$tree unless (@tree);
- my $cnt=0;
+ my @tree = split /,/, $tree;
+ push @tree, $tree unless (@tree);
+ my $cnt = 0;
my @loophierarchy;
- foreach my $element (@tree){
-# warn "tree :$element";
+ foreach my $element (@tree) {
+
+ # warn "tree :$element";
my %cell;
- my $elementdata = AUTHgetauthority($dbh,$element);
- $record= $elementdata if ($authid==$element);
- push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt,
$authid);
+ my $elementdata = AUTHgetauthority( $dbh, $element );
+ $record = $elementdata if ( $authid == $element );
+ push @loophierarchy,
+ BuildUnimarcHierarchy( $elementdata, "child" . $cnt, $authid );
$cnt++;
}
- push @loophierarchies, { 'loopelement' =>address@hidden;
+ push @loophierarchies, { 'loopelement' => address@hidden };
$template->param(
- 'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
- 'loophierarchies' =>address@hidden,
+ 'displayhierarchy' =>
+ C4::Context->preference("AuthDisplayHierarchy"),
+ 'loophierarchies' => address@hidden,
);
}
-} else {
- $record=AUTHgetauthority($dbh,$authid);
+}
+else {
+ $record = AUTHgetauthority( $dbh, $authid );
}
my $count = AUTHcount_usage($authid);
# find the marc field/subfield used in biblio by this authority
-my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure
where authtypecode=?");
+my $sth =
+ $dbh->prepare(
+ "select distinct tagfield from marc_subfield_structure where
authtypecode=?"
+ );
$sth->execute($authtypecode);
my $biblio_fields;
-while (my ($tagfield) = $sth->fetchrow) {
- $biblio_fields.= $tagfield."9,";
+while ( my ($tagfield) = $sth->fetchrow ) {
+ $biblio_fields .= $tagfield . "9,";
}
chop $biblio_fields;
# fill arrays
-my @loop_data =();
+my @loop_data = ();
my $tag;
+
# loop through each tab 0 through 9
# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
# loop through each tag
my @fields = $record->fields();
-my @loop_data =();
foreach my $field (@fields) {
my @subfields_data;
+
# if tag <10, there's no subfield, use the "@" trick
- if ($field->tag()<10) {
- next if ($tagslib->{$field->tag()}->{'@'}->{hidden});
+ if ( $field->tag() < 10 ) {
+ next if ( $tagslib->{ $field->tag() }->{'@'}->{hidden} );
my %subfield_data;
-
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
- $subfield_data{marc_value}=$field->data();
- $subfield_data{marc_subfield}='@';
- $subfield_data{marc_tag}=$field->tag();
- push(@subfields_data, \%subfield_data);
- } else {
- my @subf=$field->subfields;
-# loop through each subfield
- for my $i (0..$#subf) {
+ $subfield_data{marc_lib} = $tagslib->{ $field->tag() }->{'@'}->{lib};
+ $subfield_data{marc_value} = $field->data();
+ $subfield_data{marc_subfield} = '@';
+ $subfield_data{marc_tag} = $field->tag();
+ push( @subfields_data, \%subfield_data );
+ }
+ else {
+ my @subf = $field->subfields;
+
+ # loop through each subfield
+ for my $i ( 0 .. $#subf ) {
$subf[$i][0] = "@" unless $subf[$i][0];
- next if
($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
+ next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden}
);
my %subfield_data;
-
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
- if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl})
{
- $subfield_data{marc_value}="<a
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
- } else {
- $subfield_data{marc_value}=$subf[$i][1];
- }
- $subfield_data{marc_subfield}=$subf[$i][0];
- $subfield_data{marc_tag}=$field->tag();
- push(@subfields_data, \%subfield_data);
+ $subfield_data{marc_lib} =
+ $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
+ if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl} ) {
+ $subfield_data{marc_value} =
+ "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
}
+ else {
+ $subfield_data{marc_value} = $subf[$i][1];
}
- if ($#subfields_data>=0) {
+ $subfield_data{marc_subfield} = $subf[$i][0];
+ $subfield_data{marc_tag} = $field->tag();
+ push( @subfields_data, \%subfield_data );
+ }
+ }
+ if ( $#subfields_data >= 0 ) {
my %tag_data;
- $tag_data{tag}=$field->tag().' -'.
$tagslib->{$field->tag()}->{lib};
+ $tag_data{tag} =
+ $field->tag() . ' -' . $tagslib->{ $field->tag() }->{lib};
$tag_data{subfield} = address@hidden;
- push (@loop_data, \%tag_data);
+ push( @loop_data, \%tag_data );
}
}
-$template->param("0XX" =>address@hidden);
+$template->param( "0XX" => address@hidden );
my $authtypes = getauthtypes;
my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
+foreach my $thisauthtype ( keys %$authtypes ) {
my $selected = 1 if $thisauthtype eq $authtypecode;
- my %row =(value => $thisauthtype,
+ my %row = (
+ value => $thisauthtype,
selected => $selected,
authtypetext =>
$authtypes->{$thisauthtype}{'authtypetext'},
);
push @authtypesloop, \%row;
}
-$template->param(authid => $authid,
+$template->param(
+ authid => $authid,
count => $count,
biblio_fields => $biblio_fields,
authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
@@ -177,6 +196,6 @@
opacsmallimage =>
C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet =>
C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet =>
C4::Context->preference("opaccolorstylesheet"),
- );
+);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-authorities-home.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authorities-home.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- opac/opac-authorities-home.pl 30 Nov 2006 18:23:51 -0000 1.1.4.2
+++ opac/opac-authorities-home.pl 7 Dec 2006 15:42:15 -0000 1.1.4.3
@@ -30,139 +30,150 @@
use C4::AuthoritiesMarc;
use C4::Koha; # XXX subfield_is_koha_internal_p
-my $query=new CGI;
+my $query = new CGI;
my $op = $query->param('op');
my $authtypecode = $query->param('authtypecode');
my $dbh = C4::Context->dbh;
-my $startfrom=$query->param('startfrom');
-my $authid=$query->param('authid');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
+my $startfrom = $query->param('startfrom');
+my $authid = $query->param('authid');
+$startfrom = 0 if ( !defined $startfrom );
+my ( $template, $loggedinuser, $cookie );
my $resultsperpage;
my $authtypes = getauthtypes;
my @authtypesloop;
-foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys
%$authtypes) {
+foreach my $thisauthtype ( sort { $authtypes->{$a} <=> $authtypes->{$b} }
+ keys %$authtypes )
+{
my $selected = 1 if $thisauthtype eq $authtypecode;
- my %row =(value => $thisauthtype,
+ my %row = (
+ value => $thisauthtype,
selected => $selected,
authtypetext =>
$authtypes->{$thisauthtype}{'authtypetext'},
);
push @authtypesloop, \%row;
}
-if ($op eq "do_search") {
+if ( $op eq "do_search" ) {
my @marclist = $query->param('marclist');
my @and_or = $query->param('and_or');
my @excluding = $query->param('excluding');
my @operator = $query->param('operator');
my @value = $query->param('value');
- $resultsperpage= $query->param('resultsperpage');
- $resultsperpage = 19 if(!defined $resultsperpage);
+ $resultsperpage = $query->param('resultsperpage');
+ $resultsperpage = 19 if ( !defined $resultsperpage );
my @tags;
- my ($results,$total, @fields) = authoritysearch($dbh,
address@hidden,address@hidden,
-
address@hidden, address@hidden, address@hidden,
-
$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-authoritiessearchresultlist.tmpl",
+ my ( $results, $total, @fields ) =
+ authoritysearch( $dbh, address@hidden, address@hidden, address@hidden,
address@hidden,
+ address@hidden, $startfrom * $resultsperpage,
+ $resultsperpage, $authtypecode );
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-authoritiessearchresultlist.tmpl",
query => $query,
type => 'opac',
authnotrequired => 1,
debug => 1,
- });
+ }
+ );
# multi page display gestion
- my $displaynext=0;
- my $displayprev=$startfrom;
- if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
+ my $displaynext = 0;
+ my $displayprev = $startfrom;
+ if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
$displaynext = 1;
}
my @field_data = ();
- # we must get parameters once again. Because if there is a mainentry,
it has been replaced by something else during the search, thus the links
next/previous would not work anymore
+# we must get parameters once again. Because if there is a mainentry, it has
been replaced by something else during the search, thus the links next/previous
would not work anymore
my @marclist_ini = $query->param('marclist');
- for(my $i = 0 ; $i <= $#marclist ; $i++)
- {
- push @field_data, { term => "marclist", val=>$marclist_ini[$i]
};
- push @field_data, { term => "and_or", val=>$and_or[$i] };
- push @field_data, { term => "excluding", val=>$excluding[$i] };
- push @field_data, { term => "operator", val=>$operator[$i] };
- push @field_data, { term => "value", val=>$value[$i] };
+ for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
+ push @field_data, { term => "marclist", val => $marclist_ini[$i] };
+ push @field_data, { term => "and_or", val => $and_or[$i] };
+ push @field_data, { term => "excluding", val => $excluding[$i] };
+ push @field_data, { term => "operator", val => $operator[$i] };
+ push @field_data, { term => "value", val => $value[$i] };
}
my @numbers = ();
- if ($total>$resultsperpage)
+ if ( $total > $resultsperpage ) {
+ for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
+ if ( $i < 16 ) {
+ my $highlight = 0;
+ ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
+ push @numbers,
{
- for (my $i=1; $i<$total/$resultsperpage+1; $i++)
- {
- if ($i<16)
- {
- my $highlight=0;
- ($startfrom==($i-1)) && ($highlight=1);
- push @numbers, { number => $i,
- highlight => $highlight ,
- searchdata=> address@hidden,
- startfrom => ($i-1)};
+ number => $i,
+ highlight => $highlight,
+ searchdata => address@hidden,
+ startfrom => ( $i - 1 )
+ };
}
}
}
- my $from = $startfrom*$resultsperpage+1;
+ my $from = $startfrom * $resultsperpage + 1;
my $to;
- if($total < (($startfrom+1)*$resultsperpage))
- {
+ if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
$to = $total;
- } else {
- $to = (($startfrom+1)*$resultsperpage);
}
- $template->param(result => $results) if $results;
- $template->param(FIELDS => address@hidden);
+ else {
+ $to = ( ( $startfrom + 1 ) * $resultsperpage );
+ }
+ $template->param( result => $results ) if $results;
+ $template->param( FIELDS => address@hidden );
$template->param(
- startfrom=> $startfrom,
- displaynext=>
$displaynext,
- displayprev=>
$displayprev,
+ startfrom => $startfrom,
+ displaynext => $displaynext,
+ displayprev => $displayprev,
resultsperpage =>
$resultsperpage,
- startfromnext =>
$startfrom+1,
- startfromprev =>
$startfrom-1,
-
searchdata=>address@hidden,
- total=>$total,
- from=>$from,
- to=>$to,
- numbers=>address@hidden,
-
authtypecode=>$authtypecode,
+ startfromnext => $startfrom + 1,
+ startfromprev => $startfrom - 1,
+ searchdata => address@hidden,
+ total => $total,
+ from => $from,
+ to => $to,
+ numbers => address@hidden,
+ authtypecode => $authtypecode,
isEDITORS =>
$authtypecode eq 'EDITORS',
);
-} elsif ($op eq "delete") {
+}
+elsif ( $op eq "delete" ) {
- &AUTHdelauthority($dbh,$authid, 1);
+ &AUTHdelauthority( $dbh, $authid, 1 );
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"authorities/authorities-home.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "authorities/authorities-home.tmpl",
query => $query,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => {catalogue => 1},
+ flagsrequired => { catalogue => 1 },
debug => 1,
- });
-# $template->param("statements" => address@hidden,
-# "nbstatements" =>
$nbstatements);
+ }
+ );
+
+ # $template->param("statements" => address@hidden,
+ # "nbstatements" =>
$nbstatements);
}
-elsif ($op eq "AddStatement") {
+elsif ( $op eq "AddStatement" ) {
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"authorities/authorities-home.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "authorities/authorities-home.tmpl",
query => $query,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => {catalogue => 1},
+ flagsrequired => { catalogue => 1 },
debug => 1,
- });
+ }
+ );
# Gets the entered information
my @marcfields = $query->param('marclist');
@@ -177,37 +188,39 @@
my $marcarray = create_marclist();
my $nbstatements = $query->param('nbstatements');
- $nbstatements = 1 if(!defined $nbstatements);
+ $nbstatements = 1 if ( !defined $nbstatements );
- for(my $i = 0 ; $i < $nbstatements ; $i++)
- {
+ for ( my $i = 0 ; $i < $nbstatements ; $i++ ) {
my %fields = ();
# Recreates the old scrolling lists with the previously
selected values
- my $marclist = create_scrolling_list({name=>"marclist",
- values=> $marcarray,
- size=> 1,
- default=>$marcfields[$i],
- onChange => "sql_update()"}
+ my $marclist = create_scrolling_list(
+ {
+ name => "marclist",
+ values => $marcarray,
+ size => 1,
+ default => $marcfields[$i],
+ onChange => "sql_update()"
+ }
);
$fields{'marclist'} = $marclist;
- $fields{'first'} = 1 if($i == 0);
+ $fields{'first'} = 1 if ( $i == 0 );
- # Restores the and/or parameters (no need to test the 'and' for
activation because it's the default value)
- $fields{'or'} = 1 if($and_or[$i] eq "or");
+# Restores the and/or parameters (no need to test the 'and' for activation
because it's the default value)
+ $fields{'or'} = 1 if ( $and_or[$i] eq "or" );
#Restores the "not" parameters
- $fields{'not'} = 1 if($excluding[$i]);
+ $fields{'not'} = 1 if ( $excluding[$i] );
#Restores the operators (most common operators first);
- if($operator[$i] eq "=") { $fields{'eq'} = 1; }
- elsif($operator[$i] eq "contains") { $fields{'contains'} = 1; }
- elsif($operator[$i] eq "start") { $fields{'start'} = 1; }
- elsif($operator[$i] eq ">") { $fields{'gt'} = 1; }
#greater than
- elsif($operator[$i] eq ">=") { $fields{'ge'} = 1; } #greater or
equal
- elsif($operator[$i] eq "<") { $fields{'lt'} = 1; } #lower than
- elsif($operator[$i] eq "<=") { $fields{'le'} = 1; } #lower or
equal
+ if ( $operator[$i] eq "=" ) { $fields{'eq'} = 1; }
+ elsif ( $operator[$i] eq "contains" ) { $fields{'contains'} = 1; }
+ elsif ( $operator[$i] eq "start" ) { $fields{'start'} = 1; }
+ elsif ( $operator[$i] eq ">" ) { $fields{'gt'} = 1; } #greater than
+ elsif ( $operator[$i] eq ">=" ) { $fields{'ge'} = 1; } #greater or
equal
+ elsif ( $operator[$i] eq "<" ) { $fields{'lt'} = 1; } #lower than
+ elsif ( $operator[$i] eq "<=" ) { $fields{'le'} = 1; } #lower or equal
#Restores the value
$fields{'value'} = $value[$i];
@@ -217,35 +230,44 @@
$nbstatements++;
# The new scrolling list
- my $marclist = create_scrolling_list({name=>"marclist",
- values=> $marcarray,
- size=>1,
- onChange => "sql_update()"});
- push @statements, {"marclist" => $marclist };
+ my $marclist = create_scrolling_list(
+ {
+ name => "marclist",
+ values => $marcarray,
+ size => 1,
+ onChange => "sql_update()"
+ }
+ );
+ push @statements, { "marclist" => $marclist };
- $template->param("statements" => address@hidden,
- "nbstatements" =>
$nbstatements);
+ $template->param(
+ "statements" => address@hidden,
+ "nbstatements" => $nbstatements
+ );
}
else {
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-authorities-home.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-authorities-home.tmpl",
query => $query,
type => 'opac',
authnotrequired => 1,
debug => 1,
- });
+ }
+ );
}
-$template->param(authtypesloop => address@hidden,
+$template->param(
+ authtypesloop => address@hidden,
LibraryName =>
C4::Context->preference("LibraryName"),
OpacNav => C4::Context->preference("OpacNav"),
opaccredits =>
C4::Context->preference("opaccredits"),
opacsmallimage =>
C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet =>
C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet =>
C4::Context->preference("opaccolorstylesheet"),
- );
+);
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-basket.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- opac/opac-basket.pl 5 Dec 2006 11:35:31 -0000 1.8.2.2
+++ opac/opac-basket.pl 7 Dec 2006 15:42:15 -0000 1.8.2.3
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-basket.pl,v 1.8.2.2 2006/12/05 11:35:31 toins Exp $
+# $Id: opac-basket.pl,v 1.8.2.3 2006/12/07 15:42:15 toins Exp $
use strict;
require Exporter;
@@ -23,63 +23,66 @@
use C4::Biblio;
use C4::Auth;
use C4::Interface::CGI::Output;
-use HTML::Template;
-my $query=new CGI;
+my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-basket.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+ {
+ template_name => "opac-basket.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- flagsrequired => {borrow => 1},
- });
-
+ flagsrequired => { borrow => 1 },
+ }
+);
-my $bib_list=$query->param('bib_list');
-my $print_basket=$query->param('print');
+my $bib_list = $query->param('bib_list');
+my $print_basket = $query->param('print');
my $verbose = $query->param('verbose');
-if($verbose) { $template->param(verbose => 1); }
-if ($print_basket) { $template->param(print_basket => 1); }
+if ($verbose) { $template->param( verbose => 1 ); }
+if ($print_basket) { $template->param( print_basket => 1 ); }
-my @bibs = split(/\//, $bib_list);
+my @bibs = split( /\//, $bib_list );
my @results;
my $num = 1;
-foreach my $biblionumber (@bibs) {
- $template->param(biblionumber => $biblionumber);
+foreach my $biblionumber ( @bibs ) {
+ $template->param( biblionumber => $biblionumber );
- my $dat = &GetBiblioData( $biblionumber );
- my $record = &GetMarcBiblio( $biblionumber );
- my $addauthor = &GetMarcAuthors( $record,
C4::Context->preference("marcflavour") );
+ my $dat = &GetBiblioData($biblionumber);
+ my $record = &GetMarcBiblio($biblionumber);
+ my $addauthor =
+ &GetMarcAuthors( $record, C4::Context->preference("marcflavour") );
my $authorcount = scalar @$addauthor;
- my @items = &ItemInfo(undef, $biblionumber, 'opac');
+ my @items = &GetItemsInfo( undef, $biblionumber, 'opac' );
$dat->{'additional'} = "";
foreach (@$addauthor) {
$dat->{'additional'} .= "|" . $_->{'a'};
} # for
- if($num % 2 == 1){
+ if ( $num % 2 == 1 ) {
$dat->{'even'} = 1;
}
$num++;
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = address@hidden;
- if (C4::Context->preference("BiblioDefaultView") eq "normal") {
+ if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
$dat->{dest} = "opac-detail.pl";
- } elsif (C4::Context->preference("BiblioDefaultView") eq "marc") {
- $dat->{dest} ="opac-MARCdetail.pl";
- } else {
+ }
+ elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) {
+ $dat->{dest} = "opac-MARCdetail.pl";
+ }
+ else {
$dat->{dest} = "opac-ISBDdetail.pl";
}
- push (@results, $dat);
+ push( @results, $dat );
}
-my address@hidden;
+my $resultsarray = address@hidden;
+
# my address@hidden;
-$template->param(BIBLIO_RESULTS => $resultsarray,
-);
+$template->param( BIBLIO_RESULTS => $resultsarray, );
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.32.2.5
retrieving revision 1.32.2.6
diff -u -b -r1.32.2.5 -r1.32.2.6
--- opac/opac-detail.pl 5 Dec 2006 13:38:57 -0000 1.32.2.5
+++ opac/opac-detail.pl 7 Dec 2006 15:42:15 -0000 1.32.2.6
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-detail.pl,v 1.32.2.5 2006/12/05 13:38:57 tipaul Exp $
+# $Id: opac-detail.pl,v 1.32.2.6 2006/12/07 15:42:15 toins Exp $
use strict;
require Exporter;
@@ -25,13 +25,13 @@
use C4::Auth;
use C4::Serials; #uses getsubscriptionfrom biblionumber
use C4::Interface::CGI::Output;
-use HTML::Template;
use C4::Biblio;
use C4::Amazon;
use C4::Review;
+use C4::Serials;
my $query = new CGI;
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "opac-detail.tmpl",
query => $query,
@@ -41,13 +41,12 @@
}
);
-my $biblionumber = $query->param('biblionumber');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib');
$template->param( biblionumber => $biblionumber );
# change back when ive fixed request.pl
-my @items = &ItemInfo( undef, $biblionumber, 'opac' );
-my $dat = &GetBiblioData( $biblionumber );
-
+my @items = &GetItemsInfo( $biblionumber, 'opac' );
+my $dat = &GetBiblioData($biblionumber);
#coping with subscriptions
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
my @subscriptions =
@@ -63,19 +62,8 @@
GetLatestSerials( $subscription->{subscriptionid}, 3 );
push @subs, \%cell;
}
-$dat->{'count'} = @items;
-my @title;
-foreach my $word ( split( " ", $dat->{'title'} ) ) {
- unless ( length($word) == 4 ) {
- $word =~ s/\%//g;
- }
- unless ( C4::Context->stopwords->{ uc($word) } or length($word) == 1 ) {
- my %titlepush;
- $titlepush{title} = $word;
- push @title, \%titlepush;
- } #it's NOT a stopword => use it. Otherwise, ignore
-}
+$dat->{'count'} = @items;
my $norequests = 1;
foreach my $itm (@items) {
@@ -91,63 +79,33 @@
$template->param( norequests => $norequests );
## get notes and subjects from MARC record
-my $marc = C4::Context->preference("marc");
-my @results = ( $dat, );
-if ( C4::Boolean::true_p($marc) ) {
my $dbh = C4::Context->dbh;
my $marcflavour = C4::Context->preference("marcflavour");
my $record = GetMarcBiblio($biblionumber);
my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
- my $marcauthorarray= GetMarcAuthors( $record,
C4::Context->preference("marcflavour") );
- my $authorcount = scalar @$marcauthorarray;
-
- $results[0]->{MARCNOTES} = $marcnotesarray;
+ my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
- $results[0]->{MARCSUBJCTS} = $marcsubjctsarray;
- $template->param(MARCNOTES => $marcnotesarray);
- $template->param(MARCSUBJCTS => $marcsubjctsarray);
- $template->param(MARCAUTHORS => $marcauthorarray);
-}
-
-# get the number of reviews
-my $reviewcount = numberofreviews($biblionumber);
-$dat->{'reviews'} = $reviewcount;
+ $template->param(
+ MARCNOTES => $marcnotesarray,
+ MARCSUBJCTS => $marcsubjctsarray,
+ MARCAUTHORS => $marcauthorsarray
+ );
my @results = ( $dat, );
-my $resultsarray = address@hidden;
-my $itemsarray = address@hidden;
-my $titlewords = address@hidden;
-my $authorwords = address@hidden;
-
-#coping with subscriptions
-my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
-my @subscriptions =
- GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
-my @subs;
-foreach my $subscription (@subscriptions) {
-
- #warn "subsid :" . $subscription->{subscriptionid};
- my %cell;
- $cell{subscriptionid} = $subscription->{subscriptionid};
- $cell{subscriptionnotes} = $subscription->{notes};
-
- #get the three latest serials.
- $cell{latestserials} =
- GetLatestSerials( $subscription->{subscriptionid}, 3 );
- push @subs, \%cell;
+foreach ( keys %{$dat} ) {
+ $template->param( "$_" => $dat->{$_} . "" );
}
$template->param(
- BIBLIO_RESULTS => $resultsarray,
- ITEM_RESULTS => $itemsarray,
+ ITEM_RESULTS => address@hidden,
+ subscriptionsnumber => $subscriptionsnumber,
+ biblionumber => $biblionumber,
subscriptions => address@hidden,
subscriptionsnumber => $subscriptionsnumber,
LibraryName => C4::Context->preference("LibraryName"),
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
- titlewords => $titlewords,
- authorwords => $authorwords,
reviewson => C4::Context->preference("marc"),
);
## Amazon.com stuff
Index: opac/opac-detailprint.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detailprint.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- opac/opac-detailprint.pl 5 Dec 2006 11:35:31 -0000 1.3.2.3
+++ opac/opac-detailprint.pl 7 Dec 2006 15:42:15 -0000 1.3.2.4
@@ -29,11 +29,11 @@
use C4::Interface::CGI::Output;
use C4::Date;
-my $query=new CGI;
-my $type=$query->param('type');
-($type) || ($type='intra');
+my $query = new CGI;
+my $type = $query->param('type');
+($type) || ( $type = 'intra' );
-my $biblionumber=$query->param('biblionumber');
+my $biblionumber = $query->param('biblionumber');
# change back when ive fixed request.pl
my @items = GetItemInfosOf($biblionumber);
@@ -43,43 +43,48 @@
}
my $dat = GetBiblioData($biblionumber);
-my $record = GetMarcBiblio( $biblionumber );
-my $addauthor = GetMarcAuthors( $record,
C4::Context->preference("marcflavour") );
+my $record = GetMarcBiblio($biblionumber);
+my $addauthor =
+ GetMarcAuthors( $record, C4::Context->preference("marcflavour") );
my $authorcount = scalar @$addauthor;
-$dat->{'count'address@hidden;
+$dat->{'count'} = @items;
$dat->{'norequests'} = $norequests;
-$dat->{'additional'} ="";
+$dat->{'additional'} = "";
foreach (@$addauthor) {
$dat->{'additional'} .= "|" . $_->{'a'};
} # for
my @results;
-$results[0]=$dat;
+$results[0] = $dat;
-my address@hidden;
-my address@hidden;
+my $resultsarray = address@hidden;
+my $itemsarray = address@hidden;
-my $startfrom=$query->param('startfrom');
-($startfrom) || ($startfrom=0);
+my $startfrom = $query->param('startfrom');
+($startfrom) || ( $startfrom = 0 );
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
template_name => ('opac-detailprint.tmpl'),
query => $query,
type => "opac",
authnotrequired => 1,
- });
+ }
+);
-my $count=1;
+my $count = 1;
# now to get the items into a hash we can use and whack that thru
-my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
-my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
-$template->param(startfrom => $startfrom+1,
- endat => $startfrom+20,
+my $nextstartfrom =
+ ( $startfrom + 20 < $count - 20 ) ? ( $startfrom + 20 ) : ( $count - 20 );
+my $prevstartfrom = ( $startfrom - 20 > 0 ) ? ( $startfrom - 20 ) : (0);
+$template->param(
+ startfrom => $startfrom + 1,
+ endat => $startfrom + 20,
numrecords => $count,
nextstartfrom => $nextstartfrom,
prevstartfrom => $prevstartfrom,
@@ -87,11 +92,10 @@
ITEM_RESULTS => $itemsarray,
loggedinuser => $loggedinuser,
biblionumber => $biblionumber,
- );
+);
output_html_with_http_headers $query, $cookie, $template->output;
-
# Local Variables:
# tab-width: 8
# End:
Index: opac/opac-dictionary.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-dictionary.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- opac/opac-dictionary.pl 11 Aug 2006 16:08:28 -0000 1.4
+++ opac/opac-dictionary.pl 7 Dec 2006 15:42:15 -0000 1.4.2.1
@@ -1,6 +1,5 @@
#!/usr/bin/perl
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -48,95 +47,120 @@
=cut
my $input = new CGI;
-my $field =$input->param('marclist');
+my $field = $input->param('marclist');
+
#warn "field :$field";
-my ($tablename, $kohafield)=split /./,$field;
+my ( $tablename, $kohafield ) = split /./, $field;
+
#my $tablename=$input->param('tablename');
-$tablename="biblio" unless ($tablename);
+$tablename = "biblio" unless ($tablename);
+
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
+
# warn " ".$search[0];
my $index = $input->param('index');
+
# warn " index: ".$index;
-my $op=$input->param('op');
-if (($search[0]) and not ($op eq 'do_search')){
- $op='do_search';
+my $op = $input->param('op');
+if ( ( $search[0] ) and not( $op eq 'do_search' ) ) {
+ $op = 'do_search';
}
my $script_name = 'opac-dictionary.pl';
my $query;
-my $type=$input->param('type');
+my $type = $input->param('type');
+
#warn " ".$type;
my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie);
+my ( $template, $loggedinuser, $cookie );
my $env;
-my $startfrom=$input->param('startfrom');
-$startfrom=0 if(!defined $startfrom);
+my $startfrom = $input->param('startfrom');
+$startfrom = 0 if ( !defined $startfrom );
my $searchdesc;
my $resultsperpage;
#warn "Starting process";
-if ($op eq "do_search") {
+if ( $op eq "do_search" ) {
+
#
# searching in biblio
#
- my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from
marc_subfield_structure where kohafield = ?");
+ my $sth =
+ $dbh->prepare(
+"Select distinct tagfield,tagsubfield from marc_subfield_structure where
kohafield = ?"
+ );
$sth->execute("$field");
- my (@tags, @and_or, @operator, @excluding,@value);
+ my ( @tags, @and_or, @operator, @excluding, @value );
- while ((my $tagfield,my $tagsubfield,my $liblibrarian) =
$sth->fetchrow) {
+ while ( ( my $tagfield, my $tagsubfield, my $liblibrarian ) =
+ $sth->fetchrow )
+ {
push @tags, $dbh->quote("$tagfield$tagsubfield");
}
- $resultsperpage= $input->param('resultsperpage');
- $resultsperpage = 19 if(!defined $resultsperpage);
+ $resultsperpage = $input->param('resultsperpage');
+ $resultsperpage = 19 if ( !defined $resultsperpage );
my $orderby = $input->param('orderby');
- findseealso($dbh,address@hidden);
+ findseealso( $dbh, address@hidden );
my @results, my $total;
- my $strsth="select distinct subfieldvalue,
count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where
marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and
marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
- my $listtags="(";
- foreach my $tag (@tags){
- $listtags .= $tag .",";
- }
- $listtags =~s/,$/)/;
- $strsth .= $listtags." and
marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode)
group by subfieldvalue ";
-# warn "search in biblio : ".$strsth;
- my $value = uc($search[0]);
- $value=~s/\*/%/g;
- $value.= "%" if not($value=~m/%/);
-# warn " texte : ".$value;
+ my $strsth =
+"select distinct subfieldvalue, count(marc_subfield_table.bibid) from
marc_subfield_table,marc_word where marc_word.word like ? and
marc_subfield_table.bibid=marc_word.bibid and
marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
+ my $listtags = "(";
+ foreach my $tag (@tags) {
+ $listtags .= $tag . ",";
+ }
+ $listtags =~ s/,$/)/;
+ $strsth .= $listtags
+ . " and
marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode)
group by subfieldvalue ";
+
+ # warn "search in biblio : ".$strsth;
+ my $value = uc( $search[0] );
+ $value =~ s/\*/%/g;
+ $value .= "%" if not( $value =~ m/%/ );
- $sth=$dbh->prepare($strsth);
+ # warn " texte : ".$value;
+
+ $sth = $dbh->prepare($strsth);
$sth->execute($value);
- my $total;
my @catresults;
- while (my ($value,$ctresults)=$sth->fetchrow) {
-# warn "countresults : ".$ctresults;
- push @catresults,{value=> $value,
-
even=>($total-$startfrom*$resultsperpage)%2,
- count=>$ctresults
- } if
(($total>=$startfrom*$resultsperpage) and
($total<($startfrom+1)*$resultsperpage));
+ while ( my ( $value, $ctresults ) = $sth->fetchrow ) {
+
+ # warn "countresults : ".$ctresults;
+ push @catresults,
+ {
+ value => $value,
+ even => ( $total - $startfrom * $resultsperpage ) % 2,
+ count => $ctresults
+ }
+ if ( ( $total >= $startfrom * $resultsperpage )
+ and ( $total < ( $startfrom + 1 ) * $resultsperpage ) );
$total++;
}
-
- my $strsth="Select distinct authtypecode from marc_subfield_structure
where (";
- foreach my $listtags (@tags){
- my @taglist=split /,/,$listtags;
- foreach my $curtag (@taglist){
- $strsth.="(tagfield='".substr($curtag,1,3)."' AND
tagsubfield='".substr($curtag,4,1)."') OR";
+ $strsth =
+ "Select distinct authtypecode from marc_subfield_structure where (";
+ foreach my $listtags (@tags) {
+ my @taglist = split /,/, $listtags;
+ foreach my $curtag (@taglist) {
+ $strsth .=
+ "(tagfield='"
+ . substr( $curtag, 1, 3 )
+ . "' AND tagsubfield='"
+ . substr( $curtag, 4, 1 ) . "') OR";
}
}
- $strsth=~s/ OR$/)/;
- my $strsth = $strsth." and authtypecode is not NULL";
-# warn $strsth;
- my $sth=$dbh->prepare($strsth);
+ $strsth =~ s/ OR$/)/;
+ $strsth = $strsth . " and authtypecode is not NULL";
+
+ # warn $strsth;
+ $sth = $dbh->prepare($strsth);
$sth->execute;
#
@@ -144,105 +168,121 @@
#
my @authresults;
my $authnbresults;
- while ((my $authtypecode) = $sth->fetchrow) {
- my ($curauthresults,$nbresults) =
authoritysearch($dbh,[''],[''],[''],['contains'],
-
address@hidden,$startfrom*$resultsperpage,
$resultsperpage,$authtypecode);
+ while ( ( my $authtypecode ) = $sth->fetchrow ) {
+ my ( $curauthresults, $nbresults ) =
+ authoritysearch( $dbh, [''], [''], [''], ['contains'],
address@hidden,
+ $startfrom * $resultsperpage,
+ $resultsperpage, $authtypecode );
push @authresults, @$curauthresults;
- $authnbresults+=$nbresults;
-# warn "auth : $authtypecode nbauthresults : $nbresults";
+ $authnbresults += $nbresults;
+
+ # warn "auth : $authtypecode nbauthresults : $nbresults";
}
#
# OK, filling the template with authorities & biblio entries found.
#
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-dictionary.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-dictionary.tmpl",
query => $input,
type => 'opac',
authnotrequired => 1,
debug => 1,
- });
+ }
+ );
# multi page display gestion
- my $displaynext=0;
- my $displayprev=$startfrom;
- if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
+ my $displaynext = 0;
+ my $displayprev = $startfrom;
+ if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
$displaynext = 1;
}
my @field_data = ();
- for(my $i = 0 ; $i <= $#tags ; $i++) {
- push @field_data, { term => "marclist", val=>$tags[$i] };
- push @field_data, { term => "and_or", val=>$and_or[$i] };
- push @field_data, { term => "excluding", val=>$excluding[$i] };
- push @field_data, { term => "operator", val=>$operator[$i] };
- push @field_data, { term => "value", val=>$value[$i] };
+ for ( my $i = 0 ; $i <= $#tags ; $i++ ) {
+ push @field_data, { term => "marclist", val => $tags[$i] };
+ push @field_data, { term => "and_or", val => $and_or[$i] };
+ push @field_data, { term => "excluding", val => $excluding[$i] };
+ push @field_data, { term => "operator", val => $operator[$i] };
+ push @field_data, { term => "value", val => $value[$i] };
}
my @numbers = ();
- if ($total>$resultsperpage) {
- for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
- if ($i<16) {
- my $highlight=0;
- ($startfrom==($i-1)) && ($highlight=1);
- push @numbers, { number => $i,
- highlight => $highlight ,
- searchdata=> address@hidden,
- startfrom => ($i-1)};
+ if ( $total > $resultsperpage ) {
+ for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
+ if ( $i < 16 ) {
+ my $highlight = 0;
+ ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
+ push @numbers,
+ {
+ number => $i,
+ highlight => $highlight,
+ searchdata => address@hidden,
+ startfrom => ( $i - 1 )
+ };
}
}
}
- my $from = $startfrom*$resultsperpage+1;
+ my $from = $startfrom * $resultsperpage + 1;
my $to;
- if($total < (($startfrom+1)*$resultsperpage))
- {
+ if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
$to = $total;
- } else {
- $to = (($startfrom+1)*$resultsperpage);
}
- $template->param(anindex => $input->param('index'),
+ else {
+ $to = ( ( $startfrom + 1 ) * $resultsperpage );
+ }
+ $template->param(
+ anindex => $input->param('index'),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
);
- $template->param(result => address@hidden,
- catresult=> address@hidden,
+ $template->param(
+ result => address@hidden,
+ catresult => address@hidden,
search => $search[0],
- marclist =>$field,
+ marclist => $field,
authresult => address@hidden,
nbresults => $authnbresults,
- startfrom=> $startfrom,
- displaynext=> $displaynext,
- displayprev=> $displayprev,
+ startfrom => $startfrom,
+ displaynext => $displaynext,
+ displayprev => $displayprev,
resultsperpage =>
$resultsperpage,
- startfromnext => $startfrom+1,
- startfromprev => $startfrom-1,
- searchdata=>address@hidden,
- total=>$total,
- from=>$from,
- to=>$to,
- numbers=>address@hidden,
+ startfromnext => $startfrom + 1,
+ startfromprev => $startfrom - 1,
+ searchdata => address@hidden,
+ total => $total,
+ from => $from,
+ to => $to,
+ numbers => address@hidden,
MARC_ON =>
C4::Context->preference("marc"),
);
- } else {
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-dictionary.tmpl",
+}
+else {
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-dictionary.tmpl",
query => $input,
type => 'opac',
authnotrequired => 1,
debug => 1,
- });
-#warn "type : $type";
-
}
-$template->param(search => $search[0],
- marclist =>$field,
- type=>$type,
- anindex => $input->param('index'));
+ );
+
+ #warn "type : $type";
+
+}
+$template->param(
+ search => $search[0],
+ marclist => $field,
+ type => $type,
+ anindex => $input->param('index')
+);
# Print the page
output_html_with_http_headers $input, $cookie, $template->output;
Index: opac/opac-ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -b -r1.16.2.3 -r1.16.2.4
--- opac/opac-ISBDdetail.pl 5 Dec 2006 11:35:31 -0000 1.16.2.3
+++ opac/opac-ISBDdetail.pl 7 Dec 2006 15:42:15 -0000 1.16.2.4
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-ISBDdetail.pl,v 1.16.2.3 2006/12/05 11:35:31 toins Exp $
+# $Id: opac-ISBDdetail.pl,v 1.16.2.4 2006/12/07 15:42:15 toins Exp $
=head1 NAME
@@ -43,7 +43,6 @@
=cut
-
use strict;
require Exporter;
use C4::Auth;
@@ -54,128 +53,155 @@
use MARC::Record;
use C4::Biblio;
use C4::Acquisition;
-use C4::Serials; #uses getsubscriptionfrom biblionumber
-use HTML::Template;
+use C4::Serials; # uses getsubscriptionfrom biblionumber
+use C4::Koha; # use getitemtypeinfo
+#use HTML::Template;
-my $query=new CGI;
+my $query = new CGI;
-my $dbh=C4::Context->dbh;
+my $dbh = C4::Context->dbh;
-my $biblionumber=$query->param('biblionumber');
+my $biblionumber = $query->param('biblionumber');
my $itemtype = &MARCfind_frameworkcode($biblionumber);
-my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
+my $tagslib = &MARCgettagslib( $dbh, 1, $itemtype );
-my $record =GetMarcBiblio($biblionumber);
+my $record = GetMarcBiblio($biblionumber);
#coping with subscriptions
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
-my $dat = MARCmarc2koha($dbh,$record);
-my @subscriptions = GetSubscriptions($dat->{title},$dat->{issn},$biblionumber);
+my $dat = MARCmarc2koha( $dbh, $record );
+my @subscriptions =
+ GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
my @subs;
-foreach my $subscription (@subscriptions){
+foreach my $subscription (@subscriptions) {
my %cell;
- $cell{subscriptionid}= $subscription->{subscriptionid};
- $cell{subscriptionnotes}= $subscription->{notes};
+ $cell{subscriptionid} = $subscription->{subscriptionid};
+ $cell{subscriptionnotes} = $subscription->{notes};
+
#get the three latest serials.
-
$cell{latestserials}=GetLatestSerials($subscription->{subscriptionid},3);
+ $cell{latestserials} =
+ GetLatestSerials( $subscription->{subscriptionid}, 3 );
push @subs, \%cell;
}
# open template
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-ISBDdetail.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-ISBDdetail.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+);
$template->param(
subscriptions => address@hidden,
subscriptionsnumber => $subscriptionsnumber,
);
my $ISBD = C4::Context->preference('ISBD');
+
# my @blocs = split /\@/,$ISBD;
# my @fields = $record->fields();
my $res;
+
# foreach my $bloc (@blocs) {
# $bloc =~ s/\n//g;
- my $bloc = $ISBD;
- my $blocres;
- foreach my $isbdfield (split /#/,$bloc) {
-# $isbdfield= /(.?.?.?)/;
+my $bloc = $ISBD;
+my $blocres;
+foreach my $isbdfield ( split /#/, $bloc ) {
+
+ # $isbdfield= /(.?.?.?)/;
$isbdfield =~ /(\d\d\d)\|(.*)\|(.*)\|(.*)/;
- my $fieldvalue=$1;
- my $textbefore=$2;
- my $analysestring=$3;
- my $textafter=$4;
-# warn "==> $1 / $2 / $3 / $4";
-# my $fieldvalue=substr($isbdfield,0,3);
- if ($fieldvalue>0) {
+ my $fieldvalue = $1;
+ my $textbefore = $2;
+ my $analysestring = $3;
+ my $textafter = $4;
+
+ # warn "==> $1 / $2 / $3 / $4";
+ # my $fieldvalue=substr($isbdfield,0,3);
+ if ( $fieldvalue > 0 ) {
+
# warn "ERROR IN ISBD DEFINITION at : $isbdfield" unless
$fieldvalue;
-# warn "FV : $fieldvalue";
- my $hasputtextbefore=0;
- foreach my $field ($record->field($fieldvalue)) {
+ # warn "FV : $fieldvalue";
+ my $hasputtextbefore = 0;
+ foreach my $field ( $record->field($fieldvalue) ) {
my $calculated = $analysestring;
my $tag = $field->tag();
- if ($tag<10) {
- } else {
+ if ( $tag < 10 ) {
+ }
+ else {
my @subf = $field->subfields;
- for my $i (0..$#subf) {
+ for my $i ( 0 .. $#subf ) {
my $subfieldcode = $subf[$i][0];
- my $subfieldvalue =
get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
- my $tagsubf =
$tag.$subfieldcode;
- $calculated =~
s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
+ my $subfieldvalue =
+ get_authorised_value_desc( $tag, $subf[$i][0],
+ $subf[$i][1], '', $dbh );
+ my $tagsubf = $tag . $subfieldcode;
+ $calculated =~
+s/\{(.?.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
}
+
# field builded, store the result
- if ($calculated && !$hasputtextbefore)
{ # put textbefore if not done
- $blocres .=$textbefore;
- $hasputtextbefore=1
+ if ( $calculated && !$hasputtextbefore )
+ { # put textbefore if not done
+ $blocres .= $textbefore;
+ $hasputtextbefore = 1;
}
+
# remove punctuation at start
$calculated =~ s/^( |;|:|\.|-)*//g;
- $blocres.=$calculated;
+ $blocres .= $calculated;
}
}
- $blocres .=$textafter if $hasputtextbefore;
- } else {
- $blocres.=$isbdfield;
+ $blocres .= $textafter if $hasputtextbefore;
}
+ else {
+ $blocres .= $isbdfield;
}
- $res.=$blocres;
+}
+$res .= $blocres;
+
# }
$res =~ s/\{(.*?)\}//g;
$res =~ s/\\n/\n/g;
$res =~ s/\n/<br\/>/g;
+
# remove empty ()
$res =~ s/\(\)//g;
-$template->param(ISBD => $res,
- biblionumber => $biblionumber);
+$template->param(
+ ISBD => $res,
+ biblionumber => $biblionumber
+);
output_html_with_http_headers $query, $cookie, $template->output;
sub get_authorised_value_desc ($$$$$) {
- my($tag, $subfield, $value, $framework, $dbh) = @_;
+ my ( $tag, $subfield, $value, $framework, $dbh ) = @_;
#---- branch
- if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+ if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
return getbranchname($value);
}
#---- itemtypes
- if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
- return ItemType($value);
+ if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+ return getitemtypeinfo($value);
}
#---- "true" authorized value
my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
- if ($category ne "") {
- my $sth = $dbh->prepare("select lib from authorised_values where
category = ? and authorised_value = ?");
- $sth->execute($category, $value);
+ if ( $category ne "" ) {
+ my $sth =
+ $dbh->prepare(
+"select lib from authorised_values where category = ? and authorised_value = ?"
+ );
+ $sth->execute( $category, $value );
my $data = $sth->fetchrow_hashref;
return $data->{'lib'};
- } else {
+ }
+ else {
return $value; # if nothing is found return the original value
}
}
Index: opac/opac-logout.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-logout.pl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- opac/opac-logout.pl 20 Dec 2002 13:59:07 -0000 1.5
+++ opac/opac-logout.pl 7 Dec 2006 15:42:15 -0000 1.5.10.1
@@ -5,12 +5,11 @@
use C4::Output;
use HTML::Template;
-my $query=new CGI;
+my $query = new CGI;
-my $sessionID=$query->cookie('sessionID');
+my $sessionID = $query->cookie('sessionID');
-
-if ($ENV{'REMOTE_USER'}) {
+if ( $ENV{'REMOTE_USER'} ) {
print $query->header();
print startpage();
print startmenu('catalogue');
@@ -27,19 +26,20 @@
}
my $sessions;
-open (S, "/tmp/sessions");
- # FIXME - Come up with a better logging mechanism
-while (my ($sid, $u, $lasttime) = split(/:/, <S>)) {
+open( S, "/tmp/sessions" );
+
+# FIXME - Come up with a better logging mechanism
+while ( my ( $sid, $u, $lasttime ) = split( /:/, <S> ) ) {
chomp $lasttime;
(next) unless ($sid);
- (next) if ($sid eq $sessionID);
- $sessions->{$sid}->{'userid'}=$u;
- $sessions->{$sid}->{'lasttime'}=$lasttime;
-}
-open (S, ">/tmp/sessions");
-foreach (keys %$sessions) {
- my $userid=$sessions->{$_}->{'userid'};
- my $lasttime=$sessions->{$_}->{'lasttime'};
+ (next) if ( $sid eq $sessionID );
+ $sessions->{$sid}->{'userid'} = $u;
+ $sessions->{$sid}->{'lasttime'} = $lasttime;
+}
+open( S, ">/tmp/sessions" );
+foreach ( keys %$sessions ) {
+ my $userid = $sessions->{$_}->{'userid'};
+ my $lasttime = $sessions->{$_}->{'lasttime'};
print S "$_:$userid:$lasttime\n";
}
@@ -47,27 +47,31 @@
# Check that this is the ip that created the session before deleting it
-my $sth=$dbh->prepare("select userid,ip from sessions where sessionID=?");
+my $sth = $dbh->prepare("select userid,ip from sessions where sessionID=?");
$sth->execute($sessionID);
-my ($userid, $ip);
-if ($sth->rows) {
- ($userid,$ip) = $sth->fetchrow;
- if ($ip ne $ENV{'REMOTE_ADDR'}) {
+my ( $userid, $ip );
+if ( $sth->rows ) {
+ ( $userid, $ip ) = $sth->fetchrow;
+ if ( $ip ne $ENV{'REMOTE_ADDR'} ) {
+
# attempt to logout from a different ip than cookie was created at
exit;
}
}
-my $sth=$dbh->prepare("delete from sessions where sessionID=?");
+$sth = $dbh->prepare("delete from sessions where sessionID=?");
$sth->execute($sessionID);
open L, ">>/tmp/sessionlog";
-my $time=localtime(time());
-printf L "%20s from %16s logged out at %30s (manual log out).\n", $userid,
$ip, $time;
+my $time = localtime( time() );
+printf L "%20s from %16s logged out at %30s (manual log out).\n", $userid, $ip,
+ $time;
close L;
-my $cookie=$query->cookie(-name => 'sessionID',
+my $cookie = $query->cookie(
+ -name => 'sessionID',
-value => '',
- -expires => '+1y');
+ -expires => '+1y'
+);
# Should redirect to opac home page after logging out
@@ -77,10 +81,9 @@
if ($sessionID) {
print "Logged out of $sessionID<br>\n";
print "<a href=shelves.pl>Login</a>";
-} else {
+}
+else {
print "Not logged in.<br>\n";
print "<a href=shelves.pl>Login</a>";
}
-
-
Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -b -r1.23.2.2 -r1.23.2.3
--- opac/opac-main.pl 28 Sep 2006 08:16:14 -0000 1.23.2.2
+++ opac/opac-main.pl 7 Dec 2006 15:42:15 -0000 1.23.2.3
@@ -15,6 +15,8 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
+# $Id: opac-main.pl,v 1.23.2.3 2006/12/07 15:42:15 toins Exp $
+
use strict;
require Exporter;
use CGI;
@@ -33,41 +35,47 @@
my %select_branches;
my $branches = GetBranches();
my @branchloop;
-foreach my $thisbranch (keys %$branches) {
- my $selected = 1 if (C4::Context->userenv && ($thisbranch eq
C4::Context->userenv->{branch}));
- my %row =(value => $thisbranch,
+foreach my $thisbranch ( keys %$branches ) {
+ my $selected = 1
+ if ( C4::Context->userenv
+ && ( $thisbranch eq C4::Context->userenv->{branch} ) );
+ my %row = (
+ value => $thisbranch,
selected => $selected,
branchname =>
$branches->{$thisbranch}->{'branchname'},
);
push @branchloop, \%row;
}
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-main.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-main.tmpl",
type => "opac",
query => $input,
authnotrequired => 1,
- flagsrequired => {borrow => 1},
- });
+ flagsrequired => { borrow => 1 },
+ }
+);
-my $borrower = GetMember('',$borrowernumber);
+my $borrower = GetMember( '', $borrowernumber );
my @options;
-my $counter=0;
-foreach my $language (GetLanguages()) {
- my $selected='0';
-# next if $currently_selected_languages->{$language};
+my $counter = 0;
+foreach my $language ( GetLanguages() ) {
+ my $selected = '0';
+
+ # next if $currently_selected_languages->{$language};
push @options, { language => $language, counter => $counter };
$counter++;
}
# Template params
-if( (scalar @options) > 1){
+if ( ( scalar @options ) > 1 ) {
$template->param(
languages => address@hidden,
opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay")
);
}
$template->param(
- branchloop=>address@hidden,
+ branchloop => address@hidden,
suggestion =>
C4::Context->preference("suggestion"),
virtualshelves =>
C4::Context->preference("virtualshelves"),
textmessaging => $borrower->{textmessaging},
@@ -82,6 +90,8 @@
opaclanguagesdisplay => 0,
);
-$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary"))
if (C4::Context->preference("Disable_Dictionary"));
+$template->param(
+ 'Disable_Dictionary' => C4::Context->preference("Disable_Dictionary") )
+ if ( C4::Context->preference("Disable_Dictionary") );
output_html_with_http_headers $input, $cookie, $template->output;
Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- opac/opac-MARCdetail.pl 5 Dec 2006 11:35:31 -0000 1.14.2.3
+++ opac/opac-MARCdetail.pl 7 Dec 2006 15:42:15 -0000 1.14.2.4
@@ -39,7 +39,6 @@
=cut
-
use strict;
require Exporter;
use C4::Auth;
@@ -53,188 +52,251 @@
use HTML::Template;
use C4::Koha;
-my $query=new CGI;
+my $query = new CGI;
-my $dbh=C4::Context->dbh;
+my $dbh = C4::Context->dbh;
-my $biblionumber=$query->param('biblionumber');
+my $biblionumber = $query->param('biblionumber');
my $itemtype = &MARCfind_frameworkcode($biblionumber);
-my $tagslib = &MARCgettagslib($dbh,0,$itemtype);
+my $tagslib = &MARCgettagslib( $dbh, 0, $itemtype );
+
+my $record = GetMarcBiblio($biblionumber);
-my $record =GetMarcBiblio($biblionumber);
# open template
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "opac-MARCdetail.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-MARCdetail.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+);
# fill arrays
-my @loop_data =();
+my @loop_data = ();
my $tag;
+
# loop through each tab 0 through 9
-for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
-# loop through each tag
- my @loop_data =();
+for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
+
+ # loop through each tag
+ my @loop_data = ();
my @subfields_data;
+
# deal with leader
- unless ($tagslib->{'000'}->{'@'}->{tab} ne $tabloop or
$tagslib->{'000'}->{'@'}->{hidden}>0) {
+ unless ( $tagslib->{'000'}->{'@'}->{tab} ne $tabloop
+ or $tagslib->{'000'}->{'@'}->{hidden} > 0 )
+ {
my %subfield_data;
- $subfield_data{marc_lib}=$tagslib->{'000'}->{'@'}->{lib};
- $subfield_data{marc_value}=$record->leader();
- $subfield_data{marc_subfield}='@';
- $subfield_data{marc_tag}='000';
- push(@subfields_data, \%subfield_data);
+ $subfield_data{marc_lib} = $tagslib->{'000'}->{'@'}->{lib};
+ $subfield_data{marc_value} = $record->leader();
+ $subfield_data{marc_subfield} = '@';
+ $subfield_data{marc_tag} = '000';
+ push( @subfields_data, \%subfield_data );
my %tag_data;
- $tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
+ $tag_data{tag} = '000 -' . $tagslib->{'000'}->{lib};
my @tmp = @subfields_data;
$tag_data{subfield} = address@hidden;
- push (@loop_data, \%tag_data);
+ push( @loop_data, \%tag_data );
undef @subfields_data;
}
my @fields = $record->fields();
- for (my $x_i=0;$x_i<=$#fields;$x_i++) {
+ for ( my $x_i = 0 ; $x_i <= $#fields ; $x_i++ ) {
+
# if tag <10, there's no subfield, use the "@" trick
- if ($fields[$x_i]->tag()<10) {
- next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{tab} ne
$tabloop);
- next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden}>0);
+ if ( $fields[$x_i]->tag() < 10 ) {
+ next
+ if (
+ $tagslib->{ $fields[$x_i]->tag() }->{'@'}->{tab} ne $tabloop );
+ next if ( $tagslib->{ $fields[$x_i]->tag() }->{'@'}->{hidden} > 0
);
my %subfield_data;
-
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{'@'}->{lib};
- $subfield_data{marc_value}=$fields[$x_i]->data();
- $subfield_data{marc_subfield}='@';
- $subfield_data{marc_tag}=$fields[$x_i]->tag();
- push(@subfields_data, \%subfield_data);
- } else {
- my @subf=$fields[$x_i]->subfields;
+ $subfield_data{marc_lib} =
+ $tagslib->{ $fields[$x_i]->tag() }->{'@'}->{lib};
+ $subfield_data{marc_value} = $fields[$x_i]->data();
+ $subfield_data{marc_subfield} = '@';
+ $subfield_data{marc_tag} = $fields[$x_i]->tag();
+ push( @subfields_data, \%subfield_data );
+ }
+ else {
+ my @subf = $fields[$x_i]->subfields;
+
# loop through each subfield
- for my $i (0..$#subf) {
+ for my $i ( 0 .. $#subf ) {
$subf[$i][0] = "@" unless $subf[$i][0];
- next if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{tab} ne $tabloop);
- next if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden}>0);
+ next
+ if (
+ $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{tab}
+ ne $tabloop );
+ next
+ if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
+ ->{hidden} > 0 );
my %subfield_data;
-
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
-
$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
+ $subfield_data{marc_lib} =
+ $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
+ $subfield_data{link} =
+ $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{link};
$subf[$i][1] =~ s/\n/<br\/>/g;
- if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl})
{
- $subfield_data{marc_value}="<a
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
- } elsif
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq
"biblioitems.isbn") {
+ if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
+ ->{isurl} )
+ {
+ $subfield_data{marc_value} =
+ "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ }
+ elsif ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
+ ->{kohafield} eq "biblioitems.isbn" )
+ {
+
# warn " tag : ".$tagslib->{$fields[$x_i]->tag()}."
subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN :
".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
- $subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
- } else {
- if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {
- $subfield_data{authority}=$fields[$x_i]->subfield(9);
+ $subfield_data{marc_value} = DisplayISBN( $subf[$i][1] );
+ }
+ else {
+ if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
+ ->{authtypecode} )
+ {
+ $subfield_data{authority} = $fields[$x_i]->subfield(9);
}
-
$subfield_data{marc_value}=get_authorised_value_desc($fields[$x_i]->tag(),
$subf[$i][0], $subf[$i][1], '', $dbh);
+ $subfield_data{marc_value} =
+ get_authorised_value_desc( $fields[$x_i]->tag(),
+ $subf[$i][0], $subf[$i][1], '', $dbh );
}
- $subfield_data{marc_subfield}=$subf[$i][0];
- $subfield_data{marc_tag}=$fields[$x_i]->tag();
- push(@subfields_data, \%subfield_data);
+ $subfield_data{marc_subfield} = $subf[$i][0];
+ $subfield_data{marc_tag} = $fields[$x_i]->tag();
+ push( @subfields_data, \%subfield_data );
}
}
- if ($#subfields_data>=0) {
+ if ( $#subfields_data >= 0 ) {
my %tag_data;
- if (($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) &&
(C4::Context->preference('LabelMARCView') eq 'economical')) {
- $tag_data{tag}="";
- } else {
- if (C4::Context->preference('hide_marc')) {
- $tag_data{tag}=$tagslib->{$fields[$x_i]->tag()}->{lib};
- } else {
- $tag_data{tag}=$fields[$x_i]->tag().' -'.
$tagslib->{$fields[$x_i]->tag()}->{lib};
+ if ( ( $fields[$x_i]->tag() eq $fields[ $x_i - 1 ]->tag() )
+ && ( C4::Context->preference('LabelMARCView') eq 'economical' )
+ )
+ {
+ $tag_data{tag} = "";
+ }
+ else {
+ if ( C4::Context->preference('hide_marc') ) {
+ $tag_data{tag} = $tagslib->{ $fields[$x_i]->tag() }->{lib};
+ }
+ else {
+ $tag_data{tag} =
+ $fields[$x_i]->tag() . ' -'
+ . $tagslib->{ $fields[$x_i]->tag() }->{lib};
}
}
my @tmp = @subfields_data;
$tag_data{subfield} = address@hidden;
- push (@loop_data, \%tag_data);
+ push( @loop_data, \%tag_data );
undef @subfields_data;
}
}
- $template->param($tabloop."XX" =>address@hidden);
+ $template->param( $tabloop . "XX" => address@hidden );
}
+
# now, build item tab !
# the main difference is that datas are in lines and not in columns : thus, we
build the <th> first, then the values...
# loop through each tag
# warning : we may have differents number of columns in each row. Thus, we
first build a hash, complete it if necessary
# then construct template.
my @fields = $record->fields();
-my %witness; #---- stores the list of subfields used at least once, with the
"meaning" of the code
+my %witness
+ ; #---- stores the list of subfields used at least once, with the "meaning"
of the code
my @big_array;
foreach my $field (@fields) {
- next if ($field->tag()<10);
- my @subf=$field->subfields;
+ next if ( $field->tag() < 10 );
+ my @subf = $field->subfields;
my %this_row;
-# loop through each subfield
- for my $i (0..$#subf) {
- next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10);
- $witness{$subf[$i][0]} =
$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
- if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
- $this_row{$subf[$i][0]}="<a
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
- } elsif ($tagslib->{$field->tag()}->{$subf[$i][0]}->{kohafield} eq
"biblioitems.isbn") {
- $this_row{$subf[$i][0]}=DisplayISBN($subf[$i][1]);
- } else {
- $this_row{$subf[$i][0]}=get_authorised_value_desc($field->tag(),
$subf[$i][0], $subf[$i][1], '', $dbh);
+
+ # loop through each subfield
+ for my $i ( 0 .. $#subf ) {
+ next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
+ $witness{ $subf[$i][0] } =
+ $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
+ if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl} ) {
+ $this_row{ $subf[$i][0] } =
+ "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ }
+ elsif ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq
+ "biblioitems.isbn" )
+ {
+ $this_row{ $subf[$i][0] } = DisplayISBN( $subf[$i][1] );
+ }
+ else {
+ $this_row{ $subf[$i][0] } =
+ get_authorised_value_desc( $field->tag(), $subf[$i][0],
+ $subf[$i][1], '', $dbh );
}
}
if (%this_row) {
- push(@big_array, \%this_row);
+ push( @big_array, \%this_row );
}
}
-my ($holdingbrtagf,$holdingbrtagsubf) =
&MARCfind_marc_from_kohafield($dbh,"items.holdingbranch",$itemtype);
address@hidden = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}}
@big_array;
+my ( $holdingbrtagf, $holdingbrtagsubf ) =
+ &MARCfind_marc_from_kohafield( $dbh, "items.holdingbranch", $itemtype );
address@hidden =
+ sort { $a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf} } @big_array;
+
#fill big_row with missing datas
-foreach my $subfield_code (keys(%witness)) {
- for (my $i=0;$i<=$#big_array;$i++) {
- $big_array[$i]{$subfield_code}=" " unless
($big_array[$i]{$subfield_code});
+foreach my $subfield_code ( keys(%witness) ) {
+ for ( my $i = 0 ; $i <= $#big_array ; $i++ ) {
+ $big_array[$i]{$subfield_code} = " "
+ unless ( $big_array[$i]{$subfield_code} );
}
}
+
# now, construct template !
my @item_value_loop;
my @header_value_loop;
-for (my $i=0;$i<=$#big_array; $i++) {
+for ( my $i = 0 ; $i <= $#big_array ; $i++ ) {
my $items_data;
- foreach my $subfield_code (keys(%witness)) {
- $items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
+ foreach my $subfield_code ( keys(%witness) ) {
+ $items_data .= "<td>" . $big_array[$i]{$subfield_code} . "</td>";
}
my %row_data;
$row_data{item_value} = $items_data;
- push(@item_value_loop,\%row_data);
+ push( @item_value_loop, \%row_data );
}
-foreach my $subfield_code (keys(%witness)) {
+foreach my $subfield_code ( keys(%witness) ) {
my %header_value;
$header_value{header_value} = $witness{$subfield_code};
- push(@header_value_loop, \%header_value);
+ push( @header_value_loop, \%header_value );
}
-$template->param(item_loop => address@hidden,
+$template->param(
+ item_loop => address@hidden,
item_header_loop => address@hidden,
biblionumber => $biblionumber
);
output_html_with_http_headers $query, $cookie, $template->output;
sub get_authorised_value_desc ($$$$$) {
- my($tag, $subfield, $value, $framework, $dbh) = @_;
+ my ( $tag, $subfield, $value, $framework, $dbh ) = @_;
#---- branch
- if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-# return getbranchdetail($value)->{branchname};
+ if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+
+ # return getbranchdetail($value)->{branchname};
}
#---- itemtypes
- if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-# return ItemType($value);
+ if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+
+ # return ItemType($value);
}
#---- "true" authorized value
my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
- if ($category ne "") {
- my $sth = $dbh->prepare("select lib from authorised_values where
category = ? and authorised_value = ?");
- $sth->execute($category, $value);
+ if ( $category ne "" ) {
+ my $sth =
+ $dbh->prepare(
+"select lib from authorised_values where category = ? and authorised_value = ?"
+ );
+ $sth->execute( $category, $value );
my $data = $sth->fetchrow_hashref;
return $data->{'lib'};
- } else {
+ }
+ else {
return $value; # if nothing is found return the original value
}
}
Index: opac/opac-passwd.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-passwd.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- opac/opac-passwd.pl 4 Jul 2006 14:36:52 -0000 1.3
+++ opac/opac-passwd.pl 7 Dec 2006 15:42:15 -0000 1.3.2.1
@@ -32,61 +32,75 @@
my $query = new CGI;
my $dbh = C4::Context->dbh;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-passwd.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-passwd.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-my $sth = $dbh->prepare("UPDATE borrowers SET password = ? WHERE
borrowernumber=?");
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
+my $sth =
+ $dbh->prepare("UPDATE borrowers SET password = ? WHERE borrowernumber=?");
+
+if ( $query->param('Oldkey')
+ && $query->param('Newkey')
+ && $query->param('Confirm') )
+{
+ if ( goodkey( $dbh, $borrowernumber, $query->param('Oldkey') ) ) {
+ if ( $query->param('Newkey') eq $query->param('Confirm')
+ && length( $query->param('Confirm') ) > 5 )
+ { # Record password
+ my $clave = md5_base64( $query->param('Newkey') );
+ $sth->execute( $clave, $borrowernumber );
+ $template->param( 'password_updated' => '1' );
+ $template->param( 'borrowernumber' => $borrowernumber );
+ }
+ elsif ( $query->param('Newkey') ne $query->param('Confirm') ) {
+ $template->param( 'Ask_data' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ $template->param( 'PassMismatch' => '1' );
+ }
+ elsif ( length( $query->param('Confirm') ) <= 5 ) {
+ $template->param( 'Ask_data' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ $template->param( 'ShortPass' => '1' );
+ }
+ else {
+ $template->param( 'Error_messages' => '1' );
+ }
+ }
+ else {
+ $template->param( 'Ask_data' => '1' );
+ $template->param( 'Error_messages' => '1' );
+ $template->param( 'WrongPass' => '1' );
+ }
+}
+else {
-if ( $query->param('Oldkey') && $query->param('Newkey') &&
$query->param('Confirm') ){
- if ( goodkey($dbh,$borrowernumber, $query->param('Oldkey')) ){
- if ( $query->param('Newkey') eq $query->param('Confirm') &&
- length($query->param('Confirm')) > 5 ){ # Record
password
- my $clave = md5_base64($query->param('Newkey'));
- $sth->execute($clave,$borrowernumber);
- $template->param('password_updated' => '1');
- $template->param('borrowernumber' => $borrowernumber);
- }elsif ( $query->param('Newkey') ne $query->param('Confirm') ){
- $template->param('Ask_data' => '1');
- $template->param('Error_messages' => '1');
- $template->param('PassMismatch' => '1');
- }elsif (length($query->param('Confirm')) <= 5 ){
- $template->param('Ask_data' => '1');
- $template->param('Error_messages' => '1');
- $template->param('ShortPass' => '1');
- }else{
- $template->param('Error_messages' => '1');
- }
- }else{
- $template->param('Ask_data' => '1');
- $template->param('Error_messages' => '1');
- $template->param('WrongPass' => '1');
- }
-}else {
-# Called Empty, Ask for data.
- $template->param('Ask_data' => '1');
+ # Called Empty, Ask for data.
+ $template->param( 'Ask_data' => '1' );
}
-$template->param(LibraryName => C4::Context->preference("LibraryName"),
-);
+$template->param( LibraryName => C4::Context->preference("LibraryName"), );
output_html_with_http_headers $query, $cookie, $template->output;
-
sub goodkey {
-my ($dbh, $borrowernumber, $key) = @_;
+ my ( $dbh, $borrowernumber, $key ) = @_;
- my $sth=$dbh->prepare("SELECT password FROM borrowers WHERE
borrowernumber=?");
+ my $sth =
+ $dbh->prepare("SELECT password FROM borrowers WHERE borrowernumber=?");
$sth->execute($borrowernumber);
- if ($sth->rows){
+ if ( $sth->rows ) {
my ($md5password) = $sth->fetchrow;
- if (md5_base64($key) eq $md5password) { return 1; } else {
return 0; }
- }else{ return 0; }
+ if ( md5_base64($key) eq $md5password ) { return 1; }
+ else { return 0; }
+ }
+ else { return 0; }
}
Index: opac/opac-readingrecord.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- opac/opac-readingrecord.pl 21 May 2006 01:50:51 -0000 1.10
+++ opac/opac-readingrecord.pl 7 Dec 2006 15:42:15 -0000 1.10.2.1
@@ -1,4 +1,22 @@
#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+# $Id: opac-readingrecord.pl,v 1.10.2.1 2006/12/07 15:42:15 toins Exp $
+
use strict;
require Exporter;
use CGI;
@@ -12,44 +30,46 @@
use C4::Interface::CGI::Output;
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-readingrecord.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-readingrecord.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
$template->param($borr);
# get the record
-my $order=$query->param('order');
-my $order2=$order;
-if ($order2 eq ''){
- $order2="date_due desc";
- $template->param(orderbydate => 1);
+my $order = $query->param('order');
+my $order2 = $order;
+if ( $order2 eq '' ) {
+ $order2 = "date_due desc";
+ $template->param( orderbydate => 1 );
}
-if($order2 eq 'title'){
- $template->param(orderbytitle => 1);
- }
+if ( $order2 eq 'title' ) {
+ $template->param( orderbytitle => 1 );
+}
-if($order2 eq 'author'){
- $template->param(orderbyauthor => 1);
+if ( $order2 eq 'author' ) {
+ $template->param( orderbyauthor => 1 );
}
-my $limit=$query->param('limit');
-if ($limit eq 'full'){
- $limit=0;
-} else {
- $limit=50;
+my $limit = $query->param('limit');
+if ( $limit eq 'full' ) {
+ $limit = 0;
}
-my ($count,$issues)=allissues($borrowernumber,$order2,$limit);
+else {
+ $limit = 50;
+}
+my ( $count, $issues ) = allissues( $borrowernumber, $order2, $limit );
# add the row parity
#my $num = 0;
@@ -61,28 +81,28 @@
my @loop_reading;
-for (my $i=0;$i<$count;$i++){
+for ( my $i = 0 ; $i < $count ; $i++ ) {
my %line;
- if($i%2){
+ if ( $i % 2 ) {
$line{'toggle'} = 1;
}
- $line{biblionumber}=$issues->[$i]->{'biblionumber'};
- $line{title}=$issues->[$i]->{'title'};
- $line{author}=$issues->[$i]->{'author'};
+ $line{biblionumber} = $issues->[$i]->{'biblionumber'};
+ $line{title} = $issues->[$i]->{'title'};
+ $line{author} = $issues->[$i]->{'author'};
$line{classification} = $issues->[$i]->{'classification'};
- $line{date_due}=format_date($issues->[$i]->{'date_due'});
- $line{returndate}=format_date($issues->[$i]->{'returndate'});
- $line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
+ $line{date_due} = format_date( $issues->[$i]->{'date_due'} );
+ $line{returndate} = format_date( $issues->[$i]->{'returndate'} );
+ $line{volumeddesc} = $issues->[$i]->{'volumeddesc'};
$line{counter} = $i + 1;
- push(@loop_reading,\%line);
+ push( @loop_reading, \%line );
}
-$template->param(count => $count,
+$template->param(
+ count => $count,
READING_RECORD => address@hidden,
limit => $limit,
- showfulllink => ($count > 50),
+ showfulllink => ( $count > 50 ),
);
-
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-renew.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-renew.pl,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -b -r1.3.8.1 -r1.3.8.2
--- opac/opac-renew.pl 17 Nov 2006 14:57:22 -0000 1.3.8.1
+++ opac/opac-renew.pl 7 Dec 2006 15:42:15 -0000 1.3.8.2
@@ -12,14 +12,12 @@
my $itemnumber = $query->param('item');
my $borrowernumber = $query->param("borrowernumber");
-
-
my %env;
-my $status = renewstatus(\%env,$borrowernumber,$itemnumber);
-if ($status == 1){
- renewbook(\%env,$borrowernumber,$itemnumber);
+my $status = renewstatus( \%env, $borrowernumber, $itemnumber );
+if ( $status == 1 ) {
+ renewbook( \%env, $borrowernumber, $itemnumber );
}
-if ($query->param('from') eq 'opac_user') {
+if ( $query->param('from') eq 'opac_user' ) {
print $query->redirect("/cgi-bin/koha/opac-user.pl");
}
Index: opac/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29.2.5
retrieving revision 1.29.2.6
diff -u -b -r1.29.2.5 -r1.29.2.6
--- opac/opac-reserve.pl 5 Dec 2006 11:35:31 -0000 1.29.2.5
+++ opac/opac-reserve.pl 7 Dec 2006 15:42:15 -0000 1.29.2.6
@@ -31,17 +31,20 @@
my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-reserve.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-reserve.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
+
# my @bordat;
# $bordat[0] = $borr;
@@ -49,32 +52,33 @@
my $biblionumber = $query->param('biblionumber');
my $bibdata = GetBiblioData($biblionumber);
- $template->param($bibdata);
- $template->param(biblionumber => $biblionumber);
+$template->param($bibdata);
+$template->param( biblionumber => $biblionumber );
# get the rank number....
-my ($rank,$reserves) = FindReserves($biblionumber,'');
-$template->param(reservecount => $rank);
+my ( $rank, $reserves ) = FindReserves( $biblionumber, '' );
+$template->param( reservecount => $rank );
foreach my $res (@$reserves) {
- if ($res->{'found'} eq 'W') {
+ if ( $res->{'found'} eq 'W' ) {
$rank--;
}
}
$rank++;
-$template->param(rank => $rank);
+$template->param( rank => $rank );
# pass the pickup branch along....
my $branch = $query->param('branch');
-$template->param(branch => $branch);
+$template->param( branch => $branch );
my $branches = GetBranches();
+
# make sure it's a real branch
-if (!$branches->{$branch}) {
-$branch='';
+if ( !$branches->{$branch} ) {
+ $branch = '';
}
-$template->param(branchname => $branches->{$branch}->{'branchname'});
+$template->param( branchname => $branches->{$branch}->{'branchname'} );
# make branch selection options...
#my $branchoptions = '';
@@ -84,7 +88,7 @@
my @CGIbranchlooparray;
-foreach my $branch (keys %$branches) {
+foreach my $branch ( keys %$branches ) {
if ($branch) {
my %line;
$line{branch} = $branches->{$branch}->{'branchname'};
@@ -92,9 +96,10 @@
push @CGIbranchlooparray, \%line;
}
}
address@hidden = sort {$a->{branch} cmp $b->{branch}} @CGIbranchlooparray;
address@hidden =
+ sort { $a->{branch} cmp $b->{branch} } @CGIbranchlooparray;
my $CGIbranchloop = address@hidden;
-$template->param( CGIbranch => $CGIbranchloop);
+$template->param( CGIbranch => $CGIbranchloop );
#### THIS IS A BIT OF A HACK BECAUSE THE BIBLIOITEMS DATA IS A LITTLE MESSED
UP!
# get the itemtype data....
@@ -105,19 +110,22 @@
my %types_old;
foreach my $itm (@items) {
my $ity = $itm->{'itemtype'};
- unless ($types_old {$ity}) {
+ unless ( $types_old{$ity} ) {
$types_old{$ity}->{'itemtype'} = $ity;
- $types_old{$ity}->{'branchinfo'}->{$itm->{'branchcode'}} = 1;
+ $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} } = 1;
$types_old{$ity}->{'description'} = $itm->{'description'};
- } else {
- $types_old{$ity}->{'branchinfo'}->{$itm->{'branchcode'}} ++;
+ }
+ else {
+ $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} }++;
}
}
-foreach my $type (values %types_old) {
+foreach my $type ( values %types_old ) {
my $copies = "";
- foreach my $bc (keys %{$type->{'branchinfo'}}) {
- $copies .=
$branches->{$bc}->{'branchname'}."(".$type->{'branchinfo'}->{$bc}.")";
+ foreach my $bc ( keys %{ $type->{'branchinfo'} } ) {
+ $copies .=
+ $branches->{$bc}->{'branchname'} . "("
+ . $type->{'branchinfo'}->{$bc} . ")";
}
$type->{'copies'} = $copies;
}
@@ -133,63 +141,66 @@
}
@items = @temp;
my $itemcount = @items;
-$template->param(itemcount => $itemcount);
+$template->param( itemcount => $itemcount );
my %types;
my %itemtypes;
my @duedates;
foreach my $itm (@items) {
- push @duedates, {date_due => format_date($itm->{'date_due'})} if defined
$itm->{'date_due'};
- $itm->{$itm->{'publictype'}} = 1;
+ push @duedates, { date_due => format_date( $itm->{'date_due'} ) }
+ if defined $itm->{'date_due'};
+ $itm->{ $itm->{'publictype'} } = 1;
+
# FIXME CalcReserveFee is supposed to be internal-use-only
- my $fee = CalcReserveFee(undef, $borrowernumber,
$itm->{'biblionumber'},'a',($itm->{'biblioitemnumber'}));
+ my $fee = CalcReserveFee( undef, $borrowernumber, $itm->{'biblionumber'},
+ 'a', ( $itm->{'biblioitemnumber'} ) );
$fee = sprintf "%.02f", $fee;
$itm->{'reservefee'} = $fee;
my $pty = $itm->{'publictype'};
- $itemtypes{$itm->{'itemtype'}} = $itm;
- unless ($types {$pty}) {
+ $itemtypes{ $itm->{'itemtype'} } = $itm;
+ unless ( $types{$pty} ) {
$types{$pty}->{'count'} = 1;
- $types{$pty}->{$itm->{'itemtype'}} = 1;
- push @{$types{$pty}->{'items'}}, $itm;
- } else {
- unless ($types{$pty}->{$itm->{'itemtype'}}) {
+ $types{$pty}->{ $itm->{'itemtype'} } = 1;
+ push @{ $types{$pty}->{'items'} }, $itm;
+ }
+ else {
+ unless ( $types{$pty}->{ $itm->{'itemtype'} } ) {
$types{$pty}->{'count'}++;
- $types{$pty}->{$itm->{'itemtype'}} = 1;
- push @{$types{$pty}->{'items'}}, $itm;
+ $types{$pty}->{ $itm->{'itemtype'} } = 1;
+ push @{ $types{$pty}->{'items'} }, $itm;
}
}
}
-
-$template->param(ITEMS => address@hidden);
+$template->param( ITEMS => address@hidden );
my $width = keys %types;
-my @publictypes = sort {$b->{'count'} <=> $a->{'count'}} values %types;
+my @publictypes = sort { $b->{'count'} <=> $a->{'count'} } values %types;
my $typecount;
foreach my $pt (@publictypes) {
$typecount += $pt->{'count'};
}
-$template->param(onlyone => 1) if $typecount == 1;
+$template->param( onlyone => 1 ) if $typecount == 1;
my @typerows;
-for (my $rownum=0;$rownum<$publictypes[0]->{'count'} ;$rownum++) {
+for ( my $rownum = 0 ; $rownum < $publictypes[0]->{'count'} ; $rownum++ ) {
my @row;
foreach my $pty (@publictypes) {
- my @items = @{$pty->{'items'}};
+ my @items = @{ $pty->{'items'} };
push @row, $items[$rownum] if defined $items[$rownum];
}
my $last = @row;
- $row[$last-1]->{'last'} =1 if $last == $width;
- my $fill = ($width - $last)*2;
+ $row[ $last - 1 ]->{'last'} = 1 if $last == $width;
+ my $fill = ( $width - $last ) * 2;
$fill-- if $fill;
- push @typerows, {ROW => address@hidden, fill => $fill};
+ push @typerows, { ROW => address@hidden, fill => $fill };
}
-$template->param(TYPE_ROWS => address@hidden);
-$width = 2*$width -1;
-$template->param(totalwidth => 2*$width-1,
-);
+$template->param( TYPE_ROWS => address@hidden );
+$width = 2 * $width - 1;
+$template->param( totalwidth => 2 * $width - 1, );
+
+if ( $query->param('item_types_selected') ) {
-if ($query->param('item_types_selected')) {
# this is what happens after the itemtypes have been selected. Stage 2
my @itemtypes = $query->param('itemtype');
my $fee = 0;
@@ -200,94 +211,110 @@
$newtypes{$itmtype} = $itemtypes{$itmtype};
}
my @types = values %newtypes;
- $template->param(TYPES => address@hidden);
+ $template->param( TYPES => address@hidden );
foreach my $type (@itemtypes) {
my @reqbibs;
foreach my $item (@items) {
- if ($item->{'itemtype'} eq $type) {
+ if ( $item->{'itemtype'} eq $type ) {
push @reqbibs, $item->{'biblioitemnumber'};
}
}
- $fee +=
CalcReserveFee(undef,$borrowernumber,$biblionumber,'o',address@hidden);
+ $fee +=
+ CalcReserveFee( undef, $borrowernumber, $biblionumber, 'o',
+ address@hidden );
}
$proceed = 1;
- } elsif ($query->param('all')) {
- $template->param(all => 1);
+ }
+ elsif ( $query->param('all') ) {
+ $template->param( all => 1 );
$fee = 1;
$proceed = 1;
}
- if ($proceed && $branch) {
+ if ( $proceed && $branch ) {
$fee = sprintf "%.02f", $fee;
- $template->param(fee => $fee,istherefee => $fee>0?1:0);
- $template->param(item_types_selected => 1);
+ $template->param( fee => $fee, istherefee => $fee > 0 ? 1 : 0 );
+ $template->param( item_types_selected => 1 );
warn "Branch is ==$branch==";
- $template->param(no_branch_selected => 1) unless ($branch!='');
- } else {
- $template->param(message => 1);
- $template->param(no_items_selected => 1) unless ($proceed);
- $template->param(no_branch_selected => 1) unless ($branch);
+ $template->param( no_branch_selected => 1 ) unless ( $branch != '' );
+ }
+ else {
+ $template->param( message => 1 );
+ $template->param( no_items_selected => 1 ) unless ($proceed);
+ $template->param( no_branch_selected => 1 ) unless ($branch);
warn "Branch is ==$branch==";
}
-} elsif ($query->param('place_reserve')) {
+}
+elsif ( $query->param('place_reserve') ) {
+
# here we actually do the reserveration. Stage 3.
my $title = $bibdata->{'title'};
my @itemtypes = $query->param('itemtype');
foreach my $type (@itemtypes) {
my @reqbibs;
foreach my $item (@items) {
- if ($item->{'itemtype'} eq $type) {
+ if ( $item->{'itemtype'} eq $type ) {
push @reqbibs, $item->{'biblioitemnumber'};
}
}
-
CreateReserve(undef,$branch,$borrowernumber,$biblionumber,'o',address@hidden,$rank,'',$title);
+ CreateReserve( undef, $branch, $borrowernumber, $biblionumber, 'o',
+ address@hidden, $rank, '', $title );
}
- if ($query->param('all')) {
- CreateReserve(undef,$branch,$borrowernumber,$biblionumber,'a', undef,
$rank,'',$title);
+ if ( $query->param('all') ) {
+ CreateReserve( undef, $branch, $borrowernumber, $biblionumber, 'a',
+ undef, $rank, '', $title );
}
print $query->redirect("/cgi-bin/koha/opac-user.pl");
-} else {
+}
+else {
+
# Here we check that the borrower can actually make reserves Stage 1.
my $noreserves = 0;
my $maxoutstanding = C4::Context->preference("maxoutstanding");
- $template->param(noreserve => 1) unless $maxoutstanding;
- if ($borr->{'amountoutstanding'} > $maxoutstanding) {
+ $template->param( noreserve => 1 ) unless $maxoutstanding;
+ if ( $borr->{'amountoutstanding'} > $maxoutstanding ) {
my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
- $template->param(message => 1);
+ $template->param( message => 1 );
$noreserves = 1;
- $template->param(too_much_oweing => $amount);
+ $template->param( too_much_oweing => $amount );
}
- if ($borr->{gonenoaddress} eq 1) {
+ if ( $borr->{gonenoaddress} eq 1 ) {
$noreserves = 1;
- $template->param(message => 1,
- GNA => 1);
+ $template->param(
+ message => 1,
+ GNA => 1
+ );
}
- if ($borr->{lost} eq 1) {
+ if ( $borr->{lost} eq 1 ) {
$noreserves = 1;
- $template->param(message => 1,
- lost => 1);
+ $template->param(
+ message => 1,
+ lost => 1
+ );
}
- if ($borr->{debarred} eq 1) {
+ if ( $borr->{debarred} eq 1 ) {
$noreserves = 1;
- $template->param(message => 1,
- debarred => 1);
- }
- my ($resnum, $reserves) = FindReserves('', $borrowernumber);
- $template->param(RESERVES => $reserves);
- if ($resnum >= $MAXIMUM_NUMBER_OF_RESERVES) {
- $template->param(message => 1);
+ $template->param(
+ message => 1,
+ debarred => 1
+ );
+ }
+ my ( $resnum, $reserves ) = FindReserves( '', $borrowernumber );
+ $template->param( RESERVES => $reserves );
+ if ( $resnum >= $MAXIMUM_NUMBER_OF_RESERVES ) {
+ $template->param( message => 1 );
$noreserves = 1;
- $template->param(too_many_reserves => $resnum);
+ $template->param( too_many_reserves => $resnum );
}
foreach my $res (@$reserves) {
- if ($res->{'biblionumber'} == $biblionumber) {
- $template->param(message => 1);
+ if ( $res->{'biblionumber'} == $biblionumber ) {
+ $template->param( message => 1 );
$noreserves = 1;
- $template->param(already_reserved => 1);
+ $template->param( already_reserved => 1 );
}
}
unless ($noreserves) {
- $template->param(TYPES => address@hidden);
- $template->param(select_item_types => 1);
+ $template->param( TYPES => address@hidden );
+ $template->param( select_item_types => 1 );
}
}
Index: opac/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.38.2.5
retrieving revision 1.38.2.6
diff -u -b -r1.38.2.5 -r1.38.2.6
--- opac/opac-search.pl 30 Oct 2006 10:22:20 -0000 1.38.2.5
+++ opac/opac-search.pl 7 Dec 2006 15:42:15 -0000 1.38.2.6
@@ -3,7 +3,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.5 2006/10/30
10:22:20 tipaul Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.6 2006/12/07
15:42:15 toins Exp $
#
# Copyright 2006 LibLime
#
@@ -145,7 +145,6 @@
## STEP 1. Load things that are used in both search page and
# results page and decide which template to load, operations
# to perform, etc.
-
## load Koha modules
use C4::Context;
use C4::Interface::CGI::Output;
@@ -153,7 +152,6 @@
use C4::Search;
use C4::Koha;
use POSIX qw(ceil floor);
-
# create a new CGI object
# not sure undef_params option is working, need to test
use CGI qw('-no_undef_params');
@@ -164,21 +162,23 @@
# decide which template to use
my $template_name;
my @params = $cgi->param("limit");
-if ((@params>0) || ($cgi->param("q")) ) {
-# warn "loading results";
+if ( ( @params > 0 ) || ( $cgi->param("q") ) ) {
+
$template_name = 'opac-results.tmpl';
}
else {
-# warn "loading adv search page";
+
$template_name = 'opac-advsearch.tmpl';
}
# load the template
-($template, $borrowernumber, $cookie) = get_template_and_user({
+( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
template_name => $template_name,
query => $cgi,
type => "opac",
- authnotrequired => 1,}
+ authnotrequired => 1,
+ }
);
=head1 BUGS and FIXMEs
@@ -223,28 +223,43 @@
$template->param(branchloop => address@hidden,);
# load the itemtypes (Called Collection Codes in the template -- used for circ
rules )
-my ($itemtypecount,@item_type_loop) = GetItemTypes();
-$template->param(itemtypeloop=>address@hidden,);
+my $itemtypes = GetItemTypes;
+my @itemtypesloop;
+my $selected=1;
+my $cnt;
+my $imgdir = getitemtypeimagesrc();
+foreach my $thisitemtype ( sort keys %$itemtypes ) {
+ my %row = (
+ number => $cnt++,
+ imageurl => $imgdir . "/" . $itemtypes->{$thisitemtype}->{'imageurl'},
+ code => $thisitemtype,
+ selected => $selected,
+ description => $itemtypes->{$thisitemtype}->{'description'},
+ count5 => $cnt % 5,
+ );
+ $selected = 0 if ($selected);
+ push @itemtypesloop, \%row;
+}
+$template->param(itemtypeloop => address@hidden);
-# load the itypes (Called item types in the template -- just authorized values
for searching)
-my ($itypecount,@itype_loop) = GetCcodes();
-$template->param(itypeloop=>address@hidden,);
+# # load the itypes (Called item types in the template -- just authorized
values for searching)
+# my ($itypecount,@itype_loop) = GetCcodes();
+# $template->param(itypeloop=>address@hidden,);
# load the languages ( for switching from one template to another )
-my @languages_options = displayLanguages($cgi);
-my $languages_count = @languages_options;
-if($languages_count > 1){
- $template->param(languages => address@hidden);
-}
+# my @languages_options = displayLanguages($cgi);
+# my $languages_count = @languages_options;
+# if($languages_count > 1){
+# $template->param(languages => address@hidden);
+# }
# The following should only be loaded if we're bringing up the advanced search
template
-if ( $template_name eq "opac-advsearch.tmpl" ) {
-
+if ( $template_name eq "catalogue/advsearch.tmpl" ) {
# load the servers (used for searching -- to do federated searching,
etc.)
- my $primary_servers_loop = displayPrimaryServers();
+ my $primary_servers_loop;# = displayPrimaryServers();
$template->param(outer_servers_loop => $primary_servers_loop,);
- my $secondary_servers_loop = displaySecondaryServers();
+ my $secondary_servers_loop;# = displaySecondaryServers();
$template->param(outer_sup_servers_loop => $secondary_servers_loop,);
# load the limit types (icon-based limits in advanced search page)
@@ -260,7 +275,7 @@
# FIXME: this stuff should be cleaned up a bit and the html should be
turned
# into flags for the template -- I'll work on that soon -- JF
my @search_boxes_array;
- my $search_boxes_count = 3; # should be a syspref
+ my $search_boxes_count = 1; # should be a syspref
for (my $i=0;$i<=$search_boxes_count;$i++) {
my $this_index address@hidden; # clone the data, not just the
reference
address@hidden>{selected} = "selected";
@@ -268,7 +283,7 @@
push @search_boxes_array,
{indexes => $this_index,
search_boxes_label => "<span
class='labels'>Search for:</span>",
- scan_index => "<label for='scan'></label><input
type='checkbox' name='scan' id='scan' value='1'/>Scan Indexes",
+ scan_index => "<input type='checkbox' name='scan' id='scan'
value='1'/><label for='scan'>Scan Indexes</label>",
};
}
@@ -284,7 +299,9 @@
left_content => " <select name='op'><option
value='and' selected='selected'>and</option><option
value='or'>or</option><option value='not'>not</option></select>",};
}
}
- $template->param(search_boxes_loop => address@hidden,);
+ warn "@search_boxes_array =>" . Data::Dumper::Dumper(@search_boxes_array);
+ $template->param(uc(C4::Context->preference("marcflavour")) => 1,
+ search_boxes_loop => address@hidden);
# load the language limits (for search)
my $languages_limit_loop = displayLanguagesLimit();
@@ -294,7 +311,14 @@
my $outer_subtype_limits_loop = displaySubtypesLimit();
$template->param(outer_subtype_limits_loop =>
$outer_subtype_limits_loop,);
- my $expanded_options = $cgi->param('expanded_options');
+ my $expanded_options;
+ if (C4::Context->preference("expandedSearchOption")){
+ $expanded_options = C4::Context->preference("expandedSearchOption");
+ }
+ else{
+ $expanded_options = $cgi->param('expanded_options');
+ }
+
$template->param(expanded_options => $expanded_options);
# load the sort_by options for the template
@@ -330,6 +354,7 @@
unless (@servers) {
#FIXME: this should be handled using Context.pm
@servers = ("biblioserver");
+ # @servers = C4::Context->config("biblioserver");
}
# operators include boolean and proximity operators and are used
@@ -374,92 +399,54 @@
my $federated_query;
my $query_type; # usually not needed, but can be used to trigger ccl, cql, or
pqf queries if set
my @results;
-
## I. BUILD THE QUERY
($error,$search_desc,$koha_query,$federated_query,$query_type) =
buildQuery($query,address@hidden,address@hidden,address@hidden,address@hidden);
-
+# warn "query : $koha_query";
## II. DO THE SEARCH AND GET THE RESULTS
my $total; # the total results for the whole set
my $facets; # this object stores the faceted results that display on the
left-hand of the results page
my @results_array;
my $results_hashref;
+
eval {
($error, $results_hashref, $facets) =
getRecords($koha_query,$federated_query,address@hidden,address@hidden,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
+
};
if ($@ || $error) {
$template->param(query_error => $error.$@);
- warn "error: ".$error.$@;
+# warn "error: ".$error.$@;
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
}
-#At this point, each server has given us a result set
-# now we build that set for template display
+# At this point, each server has given us a result set
+# now we build that set for template display
my @sup_results_array;
for (my $i=0;$i<address@hidden;$i++) {
my $server = $servers[$i];
-
if ($server =~/biblioserver/) { # this is the local bibliographic server
$hits = $results_hashref->{$server}->{"hits"};
-
- # build results for the template.
my @newresults = searchResults(
$search_desc,$hits,$results_per_page,$offset,@{$results_hashref->{$server}->{"RECORDS"}});
$total = $total + $results_hashref->{$server}->{"hits"};
- ## If there's just one result, redirect to the detail page
- if ($total == 1) {
- my address@hidden>{biblionumber};
- print $cgi->redirect("/bib/$biblionumber");
- exit;
- }
if ($hits) {
$template->param(total => $hits);
$template->param(searchdesc => $search_desc );
$template->param(results_per_page => $results_per_page);
$template->param(SEARCH_RESULTS => address@hidden);
- ## Build the page numbers on the bottom of the page
my @page_numbers;
-
- # total number of pages there will be
my $pages = ceil($hits / $results_per_page);
-
- # default page number
my $current_page_number = 1;
$current_page_number = ($offset / $results_per_page +
1) if $offset;
my $previous_page_offset = $offset - $results_per_page
unless ($offset - $results_per_page <0);
my $next_page_offset = $offset + $results_per_page;
-
- # If we're within the first 10 pages, keep it simple
- #warn "current page:".$current_page_number;
- if ($current_page_number < 10) {
- # just show the first 10 pages
- #
- # Loop through the pages
- my $pages_to_show = 10;
- $pages_to_show = $pages if $pages<10;
- for ($i=1; $i<=$pages_to_show;$i++) {
- # the offset for this page
+ for ($i=1; $i<=$pages;$i++) {
my $this_offset =
(($i*$results_per_page)-$results_per_page);
- # the page number for this page
my $this_page_number = $i;
- # it should only be highlighted if it's
the current page
- my $highlight = 1 if ($this_page_number ==
$current_page_number);
- # put it in the array
- push @page_numbers, { offset => $this_offset,
pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by
};
- }
- }
- # now, show twenty pages, with the current one smack in
the middle
- else {
- for ($i=$current_page_number;
$i<=($current_page_number + 20);$i++) {
- my $this_offset =
((($i-9)*$results_per_page)-$results_per_page);
- my $this_page_number = $i-9;
my $highlight = 1 if ($this_page_number ==
$current_page_number);
push @page_numbers, { offset => $this_offset, pg =>
$this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
}
-
- }
-
$template->param(PAGE_NUMBERS => address@hidden,
previous_page_offset =>
$previous_page_offset,
next_page_offset =>
$next_page_offset) unless $pages < 2;
@@ -467,7 +454,7 @@
} # end of the if local
else {
# check if it's a z3950 or opensearch source
- my $zed3950 = 1; # FIXME this value is hardcoded !
+ my $zed3950 = 0; # FIXME :: Hardcoded value.
if ($zed3950) {
my @inner_sup_results_array;
for my $sup_record (
@{$results_hashref->{$server}->{"RECORDS"}} ) {
@@ -491,8 +478,6 @@
#$template->param(FEDERATED_RESULTS => address@hidden);
-$template->param('Disable_Dictionary'=>C4::Context->preference("Disable_Dictionary"))
if (C4::Context->preference("Disable_Dictionary"));
-
$template->param(
#classlist => $classlist,
total => $total,
@@ -508,10 +493,10 @@
opacsmallimage => C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet =>
C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet =>
C4::Context->preference("opaccolorstylesheet"),
+
"BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
scan_use => $scan,
search_error => $error,
);
-
## Now let's find out if we have any supplemental data to show the user
# and in the meantime, save the current query for statistical purposes, etc.
my $koha_spsuggest; # a flag to tell if we've got suggestions coming from Koha
@@ -524,7 +509,7 @@
my $koha_spsuggest_dbh;
# FIXME: this needs to be moved to Context.pm
eval {
-
$koha_spsuggest_dbh=DBI->connect("DBI:mysql:suggest:66.213.78.79","auth","Free2cirC");
+
$koha_spsuggest_dbh=DBI->connect("DBI:mysql:suggest:66.213.78.76","auth","Free2cirC");
};
if ($@) { warn "can't connect to spsuggest db";
}
@@ -540,12 +525,10 @@
push @koha_spsuggest,\%line;
$koha_spsuggest = 1;
}
-
# Now save the current query
$koha_spsuggest_sth=$koha_spsuggest_dbh->prepare($koha_spsuggest_insert);
#$koha_spsuggest_sth->execute($phrases,$results_per_page,$ipaddress);
$koha_spsuggest_sth->finish;
-
$template->param( koha_spsuggest => $koha_spsuggest ) unless
$hits;
$template->param( SPELL_SUGGEST => address@hidden,
);
Index: opac/opac-sendbasket.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -b -r1.10.2.4 -r1.10.2.5
--- opac/opac-sendbasket.pl 5 Dec 2006 11:35:31 -0000 1.10.2.4
+++ opac/opac-sendbasket.pl 7 Dec 2006 15:42:15 -0000 1.10.2.5
@@ -29,47 +29,54 @@
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-sendbasketform.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- flagsrequired => {borrow => 1},
- });
+ flagsrequired => { borrow => 1 },
+ }
+);
-my $bib_list=$query->param('bib_list');
-my $email_add=$query->param('email_add');
-my $email_sender=$query->param('email_sender');
-my $dbh=C4::Context->dbh;
+my $bib_list = $query->param('bib_list');
+my $email_add = $query->param('email_add');
+my $email_sender = $query->param('email_sender');
+my $dbh = C4::Context->dbh;
if ($email_add) {
my $email_from = C4::Context->preference('KohaAdminEmailAddress');
- my %mail = ( To => $email_add,
- From => $email_from);
+ my %mail = (
+ To => $email_add,
+ From => $email_from
+ );
- my ($template2, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-sendbasket.tmpl",
+ my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-sendbasket.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- flagsrequired => {borrow => 1},
- });
+ flagsrequired => { borrow => 1 },
+ }
+ );
- my @bibs = split(/\//, $bib_list);
+ my @bibs = split( /\//, $bib_list );
my @results;
my $iso2709;
foreach my $biblionumber (@bibs) {
- $template2->param(biblionumber => $biblionumber);
+ $template2->param( biblionumber => $biblionumber );
- my $dat = GetBiblioData( $biblionumber );
- my $record = GetMarcBiblio( $biblionumber );
- my $addauthor = GetMarcAuthors( $record,
C4::Context->preference("marcflavour") );
+ my $dat = GetBiblioData($biblionumber);
+ my $record = GetMarcBiblio($biblionumber);
+ my $addauthor =
+ GetMarcAuthors( $record, C4::Context->preference("marcflavour") );
my $authorcount = scalar @$addauthor;
- my @items = &ItemInfo(undef, $biblionumber, 'opac');
+ my @items = &ItemInfo( undef, $biblionumber, 'opac' );
- $dat->{'additional'}="";
+ $dat->{'additional'} = "";
foreach (@$addauthor) {
$dat->{'additional'} .= "|" . $_->{'a'};
}
@@ -77,46 +84,53 @@
$dat->{'biblionumber'} = $biblionumber;
$dat->{ITEM_RESULTS} = address@hidden;
-
$iso2709 .= $record->as_usmarc();
- push (@results, $dat);
+ push( @results, $dat );
}
- my address@hidden;
- $template2->param(BIBLIO_RESULTS => $resultsarray,
- email_sender => $email_sender);
+ my $resultsarray = address@hidden;
+ $template2->param(
+ BIBLIO_RESULTS => $resultsarray,
+ email_sender => $email_sender
+ );
# Getting template result
my $template_res = $template2->output();
my $body;
# Analysing information and getting mail properties
- if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'}
= $1; }
+ if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
+ $mail{'subject'} = $1;
+ }
else { $mail{'subject'} = "no subject"; }
my $email_header = "";
- if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header =
$1; }
+ if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
+ $email_header = $1;
+ }
my $email_file = "basket.txt";
- if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file =
$1; }
+ if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
+ $email_file = $1;
+ }
- if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $body = $1; }
+ if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = $1; }
my $boundary = "====" . time() . "====";
-# $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
-#
-# $email_header = encode_qp($email_header);
-#
-# $boundary = "--".$boundary;
-#
-# # Writing mail
-# $mail{body} =
+
+ # $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
+ #
+ # $email_header = encode_qp($email_header);
+ #
+ # $boundary = "--".$boundary;
+ #
+ # # Writing mail
+ # $mail{body} =
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
my $isofile = encode_base64($iso2709);
- $boundary = '--'.$boundary;
- $mail{body} =
-<<END_OF_BODY;
+ $boundary = '--' . $boundary;
+ $mail{body} = <<END_OF_BODY;
$boundary
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
@@ -132,19 +146,23 @@
END_OF_BODY
# Sending mail
- if (sendmail %mail) {
+ if ( sendmail %mail ) {
+
# do something if it works....
- $template->param(SENT => "1");
- $template->param(email_add => $email_add);
- } else {
+ $template->param( SENT => "1" );
+ $template->param( email_add => $email_add );
+ }
+ else {
+
# do something if it doesnt work....
warn "Error sending mail: $Mail::Sendmail::error \n";
}
output_html_with_http_headers $query, $cookie, $template->output;
}
else {
- $template->param(bib_list => $bib_list);
- $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
+ $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"),
);
Index: opac/opac-serial-issues.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- opac/opac-serial-issues.pl 12 Jul 2006 17:20:36 -0000 1.8
+++ opac/opac-serial-issues.pl 7 Dec 2006 15:42:15 -0000 1.8.2.1
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-serial-issues.pl,v 1.8 2006/07/12 17:20:36 toins Exp $
+# $Id: opac-serial-issues.pl,v 1.8.2.1 2006/12/07 15:42:15 toins Exp $
use strict;
use CGI;
@@ -38,23 +38,26 @@
$selectview = C4::Context->preference("SubscriptionHistory") unless
$selectview;
my $sth;
+
# my $id;
-my ($template, $loggedinuser, $cookie);
+my ( $template, $loggedinuser, $cookie );
my $biblionumber = $query->param('biblionumber');
-if ($selectview eq "full"){
+if ( $selectview eq "full" ) {
my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
my $title = $subscriptions->[0]{bibliotitle};
- my $yearmin=$subscriptions->[0]{year};
- my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
+ my $yearmin = $subscriptions->[0]{year};
+ my $yearmax = $subscriptions->[ scalar(@$subscriptions) - 1 ]{year};
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name =>
"opac-full-serial-issues.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-full-serial-issues.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+ );
# replace CR by <br> in librarian note
# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
@@ -63,22 +66,25 @@
biblionumber => $query->param('biblionumber'),
years => $subscriptions,
yearmin => $yearmin,
- yearmax =>$yearmax,
+ yearmax => $yearmax,
bibliotitle => $title,
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
);
-} else {
+}
+else {
my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
- ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "opac-serial-issues.tmpl",
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-serial-issues.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
debug => 1,
- });
+ }
+ );
# replace CR by <br> in librarian note
# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
Index: opac/opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- opac/opac-shelves.pl 30 Nov 2006 18:23:51 -0000 1.8.2.3
+++ opac/opac-shelves.pl 7 Dec 2006 15:42:15 -0000 1.8.2.4
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/opac/opac-shelves.pl,v 1.8.2.3 2006/11/30
18:23:51 toins Exp $
+# $Header: /sources/koha/koha/opac/opac-shelves.pl,v 1.8.2.4 2006/12/07
15:42:15 toins Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -34,103 +34,124 @@
my $env;
my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "opac-shelves.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-shelves.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- });
+ }
+);
# load the languages
my @languages_options = displayLanguages($query);
my $languages_count = @languages_options;
-if($languages_count > 1){
- $template->param(languages => address@hidden);
+if ( $languages_count > 1 ) {
+ $template->param( languages => address@hidden );
}
-if ($query->param('modifyshelfcontents')) {
- my $shelfnumber=$query->param('shelfnumber');
- my $barcode=$query->param('addbarcode');
- my ($item) = getiteminformation(0, $barcode);
- if (ShelfPossibleAction($loggedinuser,$shelfnumber,'manage')) {
- AddToShelf($item->{'itemnumber'}, $shelfnumber);
- foreach ($query->param) {
+if ( $query->param('modifyshelfcontents') ) {
+ my $shelfnumber = $query->param('shelfnumber');
+ my $barcode = $query->param('addbarcode');
+ my ($item) = getiteminformation( 0, $barcode );
+ if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ) ) {
+ AddToShelf( $item->{'itemnumber'}, $shelfnumber );
+ foreach ( $query->param ) {
if (/REM-(\d*)/) {
- my $itemnumber=$1;
- DelFromShelf($itemnumber, $shelfnumber);
+ my $itemnumber = $1;
+ DelFromShelf( $itemnumber, $shelfnumber );
}
}
}
}
-my ($shelflist) = GetShelves($loggedinuser,2);
+my ($shelflist) = GetShelves( $loggedinuser, 2 );
-$template->param({ loggedinuser => $loggedinuser,
- });
+$template->param( { loggedinuser => $loggedinuser, } );
SWITCH: {
- if ($query->param('op') eq 'modifsave') {
-
ModShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
+ if ( $query->param('op') eq 'modifsave' ) {
+ ModShelf(
+ $query->param('shelfnumber'), $query->param('shelfname'),
+ $loggedinuser, $query->param('category')
+ );
last SWITCH;
}
- if ($query->param('op') eq 'modif') {
- my ($shelfnumber,$shelfname,$owner,$category) =
GetShelf($query->param('shelf'));
- $template->param(edit => 1,
+ if ( $query->param('op') eq 'modif' ) {
+ my ( $shelfnumber, $shelfname, $owner, $category ) =
+ GetShelf( $query->param('shelf') );
+ $template->param(
+ edit => 1,
shelfnumber => $shelfnumber,
shelfname => $shelfname,
- "category$category" => 1);
-# editshelf($query->param('shelf'));
+ "category$category" => 1
+ );
+
+ # editshelf($query->param('shelf'));
last SWITCH;
}
- if ($query->param('viewshelf')) {
- viewshelf($query->param('viewshelf'));
+ if ( $query->param('viewshelf') ) {
+ viewshelf( $query->param('viewshelf') );
last SWITCH;
}
- if ($query->param('shelves')) {
+ if ( $query->param('shelves') ) {
shelves();
last SWITCH;
}
}
- # set the default tab, etc.
- my $shelf_type = $query->param('display');
- if ((!$shelf_type) || ($shelf_type eq 'privateshelves')) {
- $template->param(showprivateshelves => 1);
- } elsif ($shelf_type eq 'publicshelves') {
- $template->param(showpublicshelves => 1);
- }
-($shelflist) = GetShelves($loggedinuser,2); # rebuild shelflist in case a
shelf has been added
+# set the default tab, etc.
+my $shelf_type = $query->param('display');
+if ( ( !$shelf_type ) || ( $shelf_type eq 'privateshelves' ) ) {
+ $template->param( showprivateshelves => 1 );
+}
+elsif ( $shelf_type eq 'publicshelves' ) {
+ $template->param( showpublicshelves => 1 );
+}
+($shelflist) =
+ GetShelves( $loggedinuser, 2 )
+ ; # rebuild shelflist in case a shelf has been added
-my $color='';
+my $color = '';
my @shelvesloop;
my @shelveslooppriv;
-foreach my $element (sort keys %$shelflist) {
+foreach my $element ( sort keys %$shelflist ) {
my %line;
my %linepriv;
- ($color eq 0) ? ($color=1) : ($color=0);
- if ($shelflist->{$element}->{'category'} eq 2) {
- $line{'color'}= $color;
- $line{'shelf'}=$element;
- $line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
- $line{"category".$shelflist->{$element}->{'category'}} = 1;
+ ( $color eq 0 ) ? ( $color = 1 ) : ( $color = 0 );
+ if ( $shelflist->{$element}->{'category'} eq 2 ) {
+ $line{'color'} = $color;
+ $line{'shelf'} = $element;
+ $line{'shelfname'} = $shelflist->{$element}->{'shelfname'};
+ $line{ "category" . $shelflist->{$element}->{'category'} } = 1;
$line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq
$loggedinuser;
- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
- $line{'canmanage'} =
ShelfPossibleAction($loggedinuser,$element,'manage');
- $line{'firstname'}=$shelflist->{$element}->{'firstname'} unless
$shelflist->{$element}->{'owner'} eq $loggedinuser;
- $line{'surname'}=$shelflist->{$element}->{'surname'} unless
$shelflist->{$element}->{'owner'} eq $loggedinuser;
- push (@shelvesloop, \%line);
- } elsif ($shelflist->{$element}->{'category'} eq 1) {
- $linepriv{'color'}= $color;
- $linepriv{'shelf'}=$element;
- $linepriv{'shelfname'}=$shelflist->{$element}->{'shelfname'};
- $linepriv{"category".$shelflist->{$element}->{'category'}} = 1;
- $linepriv{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq
$loggedinuser;
- $linepriv{'shelfbookcount'}=$shelflist->{$element}->{'count'};
- $linepriv{'canmanage'} =
ShelfPossibleAction($loggedinuser,$element,'manage');
- $linepriv{'firstname'}=$shelflist->{$element}->{'firstname'}
unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
- $linepriv{'surname'}=$shelflist->{$element}->{'surname'}
unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
- push (@shelveslooppriv, \%linepriv);
+ $line{'shelfbookcount'} = $shelflist->{$element}->{'count'};
+ $line{'canmanage'} =
+ ShelfPossibleAction( $loggedinuser, $element, 'manage' );
+ $line{'firstname'} = $shelflist->{$element}->{'firstname'}
+ unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ $line{'surname'} = $shelflist->{$element}->{'surname'}
+ unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ push( @shelvesloop, \%line );
+ }
+ elsif ( $shelflist->{$element}->{'category'} eq 1 ) {
+ $linepriv{'color'} = $color;
+ $linepriv{'shelf'} = $element;
+ $linepriv{'shelfname'} = $shelflist->{$element}->{'shelfname'};
+ $linepriv{ "category" . $shelflist->{$element}->{'category'} } = 1;
+ $linepriv{'mine'} = 1
+ if $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ $linepriv{'shelfbookcount'} = $shelflist->{$element}->{'count'};
+ $linepriv{'canmanage'} =
+ ShelfPossibleAction( $loggedinuser, $element, 'manage' );
+ $linepriv{'firstname'} = $shelflist->{$element}->{'firstname'}
+ unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ $linepriv{'surname'} = $shelflist->{$element}->{'surname'}
+ unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ push( @shelveslooppriv, \%linepriv );
}
}
-$template->param(shelveslooppriv => address@hidden,
- shelvesloop => address@hidden);
+$template->param(
+ shelveslooppriv => address@hidden,
+ shelvesloop => address@hidden
+);
output_html_with_http_headers $query, $cookie, $template->output;
@@ -143,86 +164,101 @@
# "category$category" => 1);
# }
sub shelves {
- if (my $newshelf=$query->param('addshelf')) {
- my ($status, $string) =
AddShelf($newshelf,$query->param('owner'),$query->param('category'));
+ if ( my $newshelf = $query->param('addshelf') ) {
+ my ( $status, $string ) = AddShelf(
+ $newshelf,
+ $query->param('owner'),
+ $query->param('category')
+ );
if ($status) {
- $template->param(status1 => $status, string1 =>
$string);
+ $template->param( status1 => $status, string1 => $string );
}
}
my @paramsloop;
- foreach ($query->param()) {
+ foreach ( $query->param() ) {
my %line;
if (/DEL-(\d+)/) {
- my $delshelf=$1;
- my ($status, $string) = DelShelf($delshelf);
+ my $delshelf = $1;
+ my ( $status, $string ) = DelShelf($delshelf);
if ($status) {
- $line{'status'}=$status;
+ $line{'status'} = $status;
$line{'string'} = $string;
}
}
+
#if the shelf is not deleted, %line points on null
- push(@paramsloop,\%line);
+ push( @paramsloop, \%line );
}
- $template->param(paramsloop => address@hidden);
- my ($shelflist) = GetShelves($loggedinuser,2);
- my $color='';
+ $template->param( paramsloop => address@hidden );
+ my ($shelflist) = GetShelves( $loggedinuser, 2 );
+ my $color = '';
my @shelvesloop;
- foreach my $element (sort keys %$shelflist) {
+ foreach my $element ( sort keys %$shelflist ) {
my %line;
- ($color eq 0) ? ($color=1) : ($color=0);
- $line{'color'}=$color;
- $line{'shelf'}=$element;
- $line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ;
- push(@shelvesloop, \%line);
+ ( $color eq 0 ) ? ( $color = 1 ) : ( $color = 0 );
+ $line{'color'} = $color;
+ $line{'shelf'} = $element;
+ $line{'shelfname'} = $shelflist->{$element}->{'shelfname'};
+ $line{'shelfbookcount'} = $shelflist->{$element}->{'count'};
+ push( @shelvesloop, \%line );
}
- $template->param(shelvesloop=>address@hidden,
+ $template->param(
+ shelvesloop => address@hidden,
shelves => 1,
);
}
sub viewshelf {
- my $shelfnumber=shift;
+ my $shelfnumber = shift;
+
#check that the user can view the shelf
- return unless (ShelfPossibleAction($loggedinuser,$shelfnumber,'view'));
- my ($itemlist) = GetShelfContents( $shelfnumber);
- my $item='';
- my $color='';
+ return
+ unless ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) );
+ my ($itemlist) = GetShelfContents($shelfnumber);
+ my $item = '';
+ my $color = '';
my @itemsloop;
- foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
+ foreach $item ( sort { $a->{'barcode'} cmp $b->{'barcode'} } @$itemlist ) {
my %line;
- if ($item->{'itemnumber'}) {
- ($color eq 0) ? ($color=1) : ($color=0);
- $line{'color'}=$color;
- $line{'itemnumber'}=$item->{'itemnumber'};
- $line{'barcode'}=$item->{'barcode'};
- $line{'title'}=$item->{'title'};
- $line{'isbn'}=$item->{'isbn'};
- $line{'subtitle'}=$item->{'subtitle'};
- $line{'author'}=$item->{'author'};
- $line{'publicationyear'}=$item->{'publicationyear'};
- $line{'publishercode'}=$item->{'publishercode'};
- $line{'place'}=$item->{'place'};
- $line{'pages'}=$item->{'pages'};
- $line{'notes'}=$item->{'notes'};
- $line{'size'}=$item->{'size'};
- $line{'classification'}=$item->{'classification'};
- $line{'itemtype'}=$item->{'itemtype'};
- $line{'ccode'}=$item->{'ccode'};
+ if ( $item->{'itemnumber'} ) {
+ ( $color eq 0 ) ? ( $color = 1 ) : ( $color = 0 );
+ $line{'color'} = $color;
+ $line{'itemnumber'} = $item->{'itemnumber'};
+ $line{'barcode'} = $item->{'barcode'};
+ $line{'title'} = $item->{'title'};
+ $line{'isbn'} = $item->{'isbn'};
+ $line{'subtitle'} = $item->{'subtitle'};
+ $line{'author'} = $item->{'author'};
+ $line{'publicationyear'} = $item->{'publicationyear'};
+ $line{'publishercode'} = $item->{'publishercode'};
+ $line{'place'} = $item->{'place'};
+ $line{'pages'} = $item->{'pages'};
+ $line{'notes'} = $item->{'notes'};
+ $line{'size'} = $item->{'size'};
+ $line{'classification'} = $item->{'classification'};
+ $line{'itemtype'} = $item->{'itemtype'};
+ $line{'ccode'} = $item->{'ccode'};
$line{biblionumber} = $item->{biblionumber};
- push(@itemsloop, \%line);
+ push( @itemsloop, \%line );
}
}
- $template->param( itemsloop => address@hidden,
+ $template->param(
+ itemsloop => address@hidden,
shelfname =>
$shelflist->{$shelfnumber}->{'shelfname'},
shelfnumber => $shelfnumber,
viewshelf =>
$query->param('viewshelf'),
- manageshelf =>
&ShelfPossibleAction($loggedinuser,$shelfnumber,'manage'),
+ manageshelf =>
+ &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ),
);
}
#
# $Log: opac-shelves.pl,v $
+# Revision 1.8.2.4 2006/12/07 15:42:15 toins
+# synching opac & intranet.
+# fix some broken link & bugs.
+# removing warn compilation.
+#
# Revision 1.8.2.3 2006/11/30 18:23:51 toins
# theses scripts don't need to use C4::Search.
#
@@ -328,9 +364,6 @@
#
#
-
-
-
# Local Variables:
# tab-width: 4
# End:
Index: opac/opac-showreviews.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-showreviews.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- opac/opac-showreviews.pl 5 Dec 2006 11:35:31 -0000 1.2.2.3
+++ opac/opac-showreviews.pl 7 Dec 2006 15:42:15 -0000 1.2.2.4
@@ -30,20 +30,24 @@
my $query = new CGI;
my $biblionumber = $query->param('biblionumber');
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-showreviews.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-showreviews.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
-my $biblio=GetBiblioData($biblionumber,'opac');
-my $reviews=getreviews($biblionumber,1);
+my $biblio = GetBiblioData( $biblionumber, 'opac' );
+my $reviews = getreviews( $biblionumber, 1 );
-$template->param('reviews' => $reviews,
-'title' => $biblio->{'title'});
+$template->param(
+ 'reviews' => $reviews,
+ 'title' => $biblio->{'title'}
+);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-suggestions.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- opac/opac-suggestions.pl 7 Jul 2006 09:01:03 -0000 1.6
+++ opac/opac-suggestions.pl 7 Dec 2006 15:42:15 -0000 1.6.2.1
@@ -12,7 +12,7 @@
my $title = $input->param('title');
my $author = $input->param('author');
my $note = $input->param('note');
-my $copyrightdate =$input->param('copyrightdate');
+my $copyrightdate = $input->param('copyrightdate');
my $publishercode = $input->param('publishercode');
my $volumedesc = $input->param('volumedesc');
my $publicationyear = $input->param('publicationyear');
@@ -23,53 +23,66 @@
my $op = $input->param('op');
$op = 'else' unless $op;
-my ($template, $borrowernumber, $cookie);
+my ( $template, $borrowernumber, $cookie );
my $dbh = C4::Context->dbh;
-if (C4::Context->preference("AnonSuggestions")) {
- ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name =>
"opac-suggestions.tmpl",
+if ( C4::Context->preference("AnonSuggestions") ) {
+ ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-suggestions.tmpl",
query => $input,
type => "opac",
authnotrequired
=> 1,
- });
-if (!$borrowernumber) {
+ }
+ );
+ if ( !$borrowernumber ) {
$borrowernumber = C4::Context->preference("AnonSuggestions");
+ }
}
-} else {
- ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name =>
"opac-suggestions.tmpl",
+else {
+ ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-suggestions.tmpl",
query => $input,
type => "opac",
authnotrequired
=> 1,
- });
+ }
+ );
}
-if ($op eq "add_confirm") {
-
&NewSuggestion($borrowernumber,$title,$author,$publishercode,$note,$copyrightdate,$volumedesc,$publicationyear,$place,$isbn,'');
+if ( $op eq "add_confirm" ) {
+ &NewSuggestion(
+ $borrowernumber, $title, $author, $publishercode,
+ $note, $copyrightdate, $volumedesc, $publicationyear,
+ $place, $isbn, ''
+ );
+
# empty fields, to avoid filter in "SearchSuggestion"
- $title='';
- $author='';
- $publishercode='';
- $copyrightdate ='';
+ $title = '';
+ $author = '';
+ $publishercode = '';
+ $copyrightdate = '';
$volumedesc = '';
$publicationyear = '';
$place = '';
$isbn = '';
- $op='else';
+ $op = 'else';
}
-if ($op eq "delete_confirm") {
+if ( $op eq "delete_confirm" ) {
my @delete_field = $input->param("delete_field");
foreach my $delete_field (@delete_field) {
- &DelSuggestion($borrowernumber,$delete_field);
+ &DelSuggestion( $borrowernumber, $delete_field );
}
- $op='else';
+ $op = 'else';
}
-my $suggestions_loop=
&SearchSuggestion($borrowernumber,$author,$title,$publishercode,$status,$suggestedbyme);
-$template->param(suggestions_loop => $suggestions_loop,
+my $suggestions_loop =
+ &SearchSuggestion( $borrowernumber, $author, $title, $publishercode, $status,
+ $suggestedbyme );
+$template->param(
+ suggestions_loop => $suggestions_loop,
title => $title,
author => $author,
publishercode => $publishercode,
Index: opac/opac-userdetails.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- opac/opac-userdetails.pl 30 Nov 2006 18:23:51 -0000 1.12.2.1
+++ opac/opac-userdetails.pl 7 Dec 2006 15:42:15 -0000 1.12.2.2
@@ -17,7 +17,6 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-
use strict;
require Exporter;
use CGI;
@@ -31,27 +30,27 @@
use C4::Members;
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-userdetails.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-userdetails.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
-$borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
-$borr->{'expiry'} = format_date($borr->{'expiry'});
-$borr->{'dateofbirth'} = format_date($borr->{'dateofbirth'});
-$borr->{'ethnicity'} = fixEthnicity($borr->{'ethnicity'});
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
+$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
+$borr->{'expiry'} = format_date( $borr->{'expiry'} );
+$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );
+$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
$template->param($borr);
-$template->param(LibraryName => C4::Context->preference("LibraryName"),
-);
+$template->param( LibraryName => C4::Context->preference("LibraryName"), );
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -b -r1.23.2.1 -r1.23.2.2
--- opac/opac-user.pl 30 Aug 2006 16:38:51 -0000 1.23.2.1
+++ opac/opac-user.pl 7 Dec 2006 15:42:15 -0000 1.23.2.2
@@ -1,4 +1,22 @@
#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+# $Id: opac-user.pl,v 1.23.2.2 2006/12/07 15:42:15 toins Exp $
+
use strict;
require Exporter;
use CGI;
@@ -14,36 +32,38 @@
use C4::Letters;
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-user.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-user.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
-$borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
-$borr->{'expiry'} = format_date($borr->{'expiry'});
-$borr->{'dateofbirth'} = format_date($borr->{'dateofbirth'});
-$borr->{'ethnicity'} = fixEthnicity($borr->{'ethnicity'});
+$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
+$borr->{'expiry'} = format_date( $borr->{'expiry'} );
+$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );
+$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
-if($borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'}){
- $borr->{'flagged'} =1;
+if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
+ $borr->{'flagged'} = 1;
}
-if ($borr->{'amountoutstanding'} > 5) {
+if ( $borr->{'amountoutstanding'} > 5 ) {
$borr->{'amountoverfive'} = 1;
}
-if (5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
+if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
$borr->{'amountoverzero'} = 1;
}
-if ($borr->{'amountoutstanding'} < 0) {
+if ( $borr->{'amountoutstanding'} < 0 ) {
$borr->{'amountlessthanzero'} = 1;
- $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
+ $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
}
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
@@ -51,8 +71,8 @@
my @bordat;
$bordat[0] = $borr;
-$template->param(BORROWER_INFO => address@hidden);
-$template->param(borrowernumber => $borrowernumber);
+$template->param( BORROWER_INFO => address@hidden );
+$template->param( borrowernumber => $borrowernumber );
#get issued items ....
my $issues = getissues($borr);
@@ -61,22 +81,25 @@
my $overdues_count = 0;
my @overdues;
my @issuedat;
-foreach my $key (keys %$issues) {
+foreach my $key ( keys %$issues ) {
my $issue = $issues->{$key};
- $issue->{'date_due'} = format_date($issue->{'date_due'});
+ $issue->{'date_due'} = format_date( $issue->{'date_due'} );
# check for reserves
- my ($restype, $res) = CheckReserves($issue->{'itemnumber'});
- if ($restype) {
+ my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} );
+ if ( $restype ) {
$issue->{'reserved'} = 1;
}
+ warn "reserves1=>" . Data::Dumper::Dumper($res);
- my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
+ my ( $numaccts, $accts, $total ) = getboracctrecord( undef, $borr );
my $charges = 0;
foreach my $ac (@$accts) {
- if ($ac->{'itemnumber'} == $issue->{'itemnumber'}) {
- $charges += $ac->{'amountoutstanding'} if $ac->{'accounttype'} eq
'F';
- $charges += $ac->{'amountoutstanding'} if $ac->{'accounttype'} eq
'L';
+ if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
+ $charges += $ac->{'amountoutstanding'}
+ if $ac->{'accounttype'} eq 'F';
+ $charges += $ac->{'amountoutstanding'}
+ if $ac->{'accounttype'} eq 'L';
}
}
$issue->{'charges'} = $charges;
@@ -88,67 +111,71 @@
# check if item is renewable
my %env;
- my $status = renewstatus(\%env,$borrowernumber, $issue->{'itemnumber'});
+ my $status = renewstatus( \%env, $borrowernumber, $issue->{'itemnumber'} );
$issue->{'status'} = $status;
- if ($issue->{'overdue'}) {
+ if ( $issue->{'overdue'} ) {
push @overdues, $issue;
$overdues_count++;
$issue->{'overdue'} = 1;
- } else {
+ }
+ else {
$issue->{'issued'} = 1;
}
push @issuedat, $issue;
$count++;
}
-$template->param(ISSUES => address@hidden);
-$template->param(issues_count => $count);
+$template->param( ISSUES => address@hidden );
+$template->param( issues_count => $count );
-$template->param(OVERDUES => address@hidden);
-$template->param(overdues_count => $overdues_count);
+$template->param( OVERDUES => address@hidden );
+$template->param( overdues_count => $overdues_count );
my $branches = GetBranches();
# now the reserved items....
-my ($rcount, $reserves) = FindReserves(undef, $borrowernumber);
+my ( $rcount, $reserves ) = FindReserves( undef, $borrowernumber );
+warn "reserves2=>" . Data::Dumper::Dumper($reserves);
foreach my $res (@$reserves) {
- $res->{'reservedate'} = format_date($res->{'reservedate'});
+ $res->{'reservedate'} = format_date( $res->{'reservedate'} );
my $publictype = $res->{'publictype'};
$res->{$publictype} = 1;
$res->{'waiting'} = 1 if $res->{'found'} eq 'W';
- $res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
}
-$template->param(RESERVES => $reserves);
-$template->param(reserves_count => $rcount);
+$template->param( RESERVES => $reserves );
+$template->param( reserves_count => $rcount );
my @waiting;
my $wcount = 0;
foreach my $res (@$reserves) {
- if ($res->{'itemnumber'}) {
- my $item = getiteminformation($res->{'itemnumber'},'');
- $res->{'holdingbranch'} =
$branches->{$item->{'holdingbranch'}}->{'branchname'};
- $res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
- if($res->{'holdingbranch'} eq $res->{'branch'}){
+ if ( $res->{'itemnumber'} ) {
+ my $item = getiteminformation( $res->{'itemnumber'}, '' );
+ $res->{'holdingbranch'} =
+ $branches->{ $item->{'holdingbranch'} }->{'branchname'};
+ $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
+ if ( $res->{'holdingbranch'} eq $res->{'branch'} ) {
$res->{'atdestination'} = 1;
}
push @waiting, $res;
$wcount++;
}
}
-$template->param(WAITING => address@hidden);
+$template->param( WAITING => address@hidden );
# current alert subscriptions
warn " B : $borrowernumber";
my $alerts = getalert($borrowernumber);
foreach (@$alerts) {
- $_->{$_->{type}}=1;
- $_->{relatedto} = findrelatedto($_->{type},$_->{externalid});
+ $_->{ $_->{type} } = 1;
+ $_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
}
-$template->param(waiting_count => $wcount,
+$template->param(
+ waiting_count => $wcount,
textmessaging => $borr->{textmessaging},
OpacPasswordChange =>
C4::Context->preference("OpacPasswordChange"),
);
Index: opac/opac-userupdate.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- opac/opac-userupdate.pl 11 Aug 2006 15:59:14 -0000 1.14
+++ opac/opac-userupdate.pl 7 Dec 2006 15:42:15 -0000 1.14.2.1
@@ -17,7 +17,6 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-
use strict;
require Exporter;
use CGI;
@@ -28,48 +27,58 @@
use C4::Koha;
use C4::Circulation::Circ2;
use C4::Interface::CGI::Output;
-use HTML::Template;
use C4::Date;
use C4::Members;
my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => "opac-userupdate.tmpl",
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-userupdate.tmpl",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+);
# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
# handle the new information....
# collect the form values and send an email.
-my @fields = ('title', 'surname', 'firstname', 'phone', 'faxnumber',
'streetaddress', 'emailaddress', 'city');
+my @fields = (
+ 'title', 'surname', 'firstname', 'phone',
+ 'faxnumber', 'streetaddress', 'emailaddress', 'city'
+);
my $update;
-my $updateemailaddress= C4::Context->preference('KohaAdminEmailAddress');
-if ($updateemailaddress eq '') {
- warn "KohaAdminEmailAddress system preference not set. Couldn't send
patron update information for $borr->{'firstname'} $borr->{'surname'}
(#$borrowernumber)\n";
- my($template) = get_template_and_user({template_name => "kohaerror.tmpl",
+my $updateemailaddress = C4::Context->preference('KohaAdminEmailAddress');
+if ( $updateemailaddress eq '' ) {
+ warn
+"KohaAdminEmailAddress system preference not set. Couldn't send patron update
information for $borr->{'firstname'} $borr->{'surname'} (#$borrowernumber)\n";
+ my ($template) = get_template_and_user(
+ {
+ template_name => "kohaerror.tmpl",
query => $query,
type => "opac",
authnotrequired => 1,
- flagsrequired => {borrow => 1},
+ flagsrequired => { borrow => 1 },
debug => 1,
- });
+ }
+ );
- $template->param(errormessage => 'KohaAdminEmailAddress system preference
- is not set. Please visit the library to update your user record');
+ $template->param(
+ errormessage => 'KohaAdminEmailAddress system preference
+ is not set. Please visit the library to update your user record'
+ );
output_html_with_http_headers $query, $cookie, $template->output;
exit;
}
-if ($query->{'title'}) {
+if ( $query->{'title'} ) {
+
# get all the fields:
my $message = <<"EOF";
Borrower $borr->{'cardnumber'}
@@ -77,37 +86,39 @@
has requested to change her/his personal details.
Please check these new details and make the changes:
EOF
- foreach my $field (@fields){
+ foreach my $field (@fields) {
my $newfield = $query->param($field);
$message .= "$field : $borr->{$field} --> $newfield\n";
}
$message .= "\n\nThanks,\nKoha\n\n";
- my %mail = ( To => $updateemailaddress ,
- From => $updateemailaddress ,
+ my %mail = (
+ To => $updateemailaddress,
+ From => $updateemailaddress,
Subject => "User Request for update of Record.",
- Message => $message );
- if (sendmail %mail) {
-# do something if it works....
+ Message => $message
+ );
+ if ( sendmail %mail ) {
+
+ # do something if it works....
warn "Mail sent ok\n";
print $query->redirect('/cgi-bin/koha/opac-user.pl');
exit;
- } else {
-# do something if it doesnt work....
+ }
+ else {
+
+ # do something if it doesnt work....
warn "Error sending mail: $Mail::Sendmail::error \n";
}
}
-
-$borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
-$borr->{'expiry'} = format_date($borr->{'expiry'});
-$borr->{'dateofbirth'} = format_date($borr->{'dateofbirth'});
-$borr->{'ethnicity'} = fixEthnicity($borr->{'ethnicity'});
-
+$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
+$borr->{'expiry'} = format_date( $borr->{'expiry'} );
+$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );
+$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
my @bordat;
$bordat[0] = $borr;
-$template->param(BORROWER_INFO => address@hidden,
-);
+$template->param( BORROWER_INFO => address@hidden, );
output_html_with_http_headers $query, $cookie, $template->output;
Index: koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl
--- koha-tmpl/opac-tmpl/prog/en/opac-searchresults.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- <!-- TMPL_IF NAME="searchdesc"
-->Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'<!-- TMPL_ELSE
-->You did not specify any search criteria<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="searchdesc" -->
- <h3>Results for Search: <!-- TMPL_VAR NAME="searchdesc" --></h3>
-<!-- TMPL_ELSE -->
- <!-- TMPL_IF name="searchnew" -->
- <h3><!-- TMPL_VAR name="itemtype" --> items acquired in the
last <!-- TMPL_VAR name="duration" --> days</h3>
- <!-- TMPL_ELSE -->
- <h3>You did not specify any search criteria</h3>
- <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
- <div class="pages">
- <!-- TMPL_IF NAME=displayprev -->
- <a href="opac-search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby"
-->&type=intranet&op=do_search"><<Previous</a>
- <!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME="numbers" -->
- <!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR
NAME="number" --><!-- TMPL_ELSE -->
- <a href="opac-search.pl?startfrom=<!--
TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby" -->&type=intranet&op=do_search"><!-- TMPL_VAR
NAME="number" --></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME=displaynext -->
- <a href="opac-search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby" -->&type=intranet&op=do_search">Next
>></a>
- <!-- /TMPL_IF --></div>
- <div id="results"><!-- TMPL_IF name=total -->
- Results <!-- TMPL_VAR NAME="from" --> through <!--
TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> records.
- <!-- TMPL_ELSE -->
- No results found.
- <!-- /TMPL_IF --></div>
-
-<!-- Search Results Table -->
-<!-- TMPL_IF NAME="total" -->
-<form action="opac-searchresults.pl" method="get" name="myform">
-<input type="submit" value="Add Checked Items to Book Bag"
onclick="addMultiple(); return false;"> <input type="reset" value="Clear All" />
- <table>
- <tr>
- <!-- TMPL_IF NAME="AmazonContent" -->
- <th colspan="3">Title</th>
- <!-- TMPL_ELSE -->
- <th colspan="2">Title</th>
- <!-- /TMPL_IF -->
- <th>Author</th>
- <th>Call Number</th>
- <th>Copies</th>
- <th>Available at</th>
- </tr>
- <!-- Actual Search Results -->
- <!-- TMPL_LOOP NAME="results" -->
- <!-- TMPL_IF NAME="even" --><tr class="highlight"><!--
TMPL_ELSE --><tr><!-- /TMPL_IF -->
- <td><label for="biblionumber<!-- TMPL_VAR
NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang"
-->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR
NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br
/><input type="checkbox" name="biblionumber" id="biblionumber<!-- TMPL_VAR
NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /></td>
-<!-- TMPL_IF NAME="AmazonContent" -->
-<td><a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF
NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn"
-->.01.THUMBZZZ.jpg<!-- TMPL_ELSE
-->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!--
/TMPL_IF -->" alt="" border="0" /><!--<img class="large"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn"
-->.01._PE_SCLZZZZZZZ_.jpg" title="Enlarged view of image" alt="Enlarged view
of image" />
---></a></td>
-<!-- /TMPL_IF -->
-
- <td><!-- TMPL_IF name="BiblioDefaultViewmarc"
--><a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF
name="BiblioDefaultViewisbd" --><a
href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!--
TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="publicationyear" --> - <!--
TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
- <!-- TMPL_IF
name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF
-->
- <!-- TMPL_IF name="place" --> ;
<!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="pages" --> -
<!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="notes" --> :
<!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="size" --> ;
<!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="timestamp"
--> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF
--></td>
- <td><a
href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!--
TMPL_VAR NAME="author" ESCAPE="URL"
-->&resultsperpage=20&orderby=biblio.title&op=do_search"><!--
TMPL_VAR NAME="author" --></a></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
- <td><!-- TMPL_VAR name="totitem" -->
- </td><td><!-- TMPL_LOOP name="CN" --><!--
TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --> <!--
TMPL_IF name="date_due" --> <i>(On Loan until <!-- TMPL_VAR
name="date_due" -->)</i><!-- TMPL_ELSE --><!-- TMPL_IF name="itemcallnumber"
--> (<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF
--><br /><!-- /TMPL_LOOP --></td></tr><!-- /TMPL_LOOP -->
- </table>
-</form>
-
-<div class="pages">
- <!-- TMPL_IF NAME=displayprev -->
- <a href="opac-search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby"
-->&type=intranet&op=do_search"><<Previous</a>
- <!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME="numbers" -->
- <!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR
NAME="number" --><!-- TMPL_ELSE -->
- <a href="opac-search.pl?startfrom=<!--
TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby" -->&type=intranet&op=do_search"><!-- TMPL_VAR
NAME="number" --></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME=displaynext -->
- <a href="opac-search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&orderby=<!--
TMPL_VAR NAME="orderby" -->&type=intranet&op=do_search">Next
>></a>
- <!-- /TMPL_IF --></div>
-
-
-
-<!-- TMPL_IF name="suggestion" -->
-<div class="note">Not finding what you're looking for?<br /> Make a <a
href="opac-suggestions.pl?op=add">purchase suggestion</a></div>
-<!-- /TMPL_IF -->
-
-
-</div>
-
-
-
-<!-- TMPL_ELSE -->
-Sorry, there were no results.
-
-<!-- TMPL_IF name="suggestion" -->
-<div class="note">Not finding what you're looking for?<br /> Make a <a
href="opac-suggestions.pl?op=add">purchase suggestion</a></div>
-<!-- /TMPL_IF -->
-
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-search.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-search.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-search.tmpl
--- koha-tmpl/opac-tmpl/prog/en/opac-search.tmpl 22 Nov 2006 15:47:30
-0000 1.1.2.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,163 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" --> Catalog -- Advanced Search
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
-<!-- CONTENT -->
-<div id="main">
-<form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
-<h1>Search the Catalog</h1>
-
- <h3>Results:</h3>
- <p><label for="resultsperpage">Results per page:</label>
- <select name="resultsperpage" id="resultsperpage"
size="1">
- <option value="20">20</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select></p>
- <p><label for="orderby">Ordered by:</label>
- <select name="orderby" id="orderby" size="1">
- <option value="biblio.title">Title</option>
- <option value="biblio.author">Author</option>
- <option value="biblioitems.dewey">Dewey</option>
- <option
value="biblioitems.publicationyear">Publication Year</option>
- <option
value="biblioitems.publishercode">Publisher</option>
- </select>
- <select name="desc_or_asc" size="1">
- <option value="ASC">Ascending</option>
- <option value="DESC">Descending</option>
- </select>
- </p>
-
-<table>
-<tr><th scope="row"><label for="keyword">Keyword</label></th><td><input
type="hidden" name="op" value="do_search" />
- <input type="hidden" name="nbstatements" value="<!--
TMPL_VAR NAME="nbstatements" -->" />
- <input type="hidden" name="marclist" value="" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" id="keyword" name="value"
/></td></tr>
-<tr><th scope="row"><label for="title">Title</label></th><td><input
type="hidden" name="marclist" value="biblio.title" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" id="title" name="value" /><!--
TMPL_UNLESS NAME="Disable_Dictionary" --><a
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&type=intranet&index=1',1)"><strong>...</strong></a><!--
/TMPL_UNLESS --></td></tr>
-<tr><th scope="row"><label for="author">Author</label></th><td><input
type="hidden" name="marclist" value="biblio.author" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" id="author" name="value" /><!--
TMPL_UNLESS NAME="Disable_Dictionary" --><a
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&type=intranet&index=2',2)"><strong>...</strong></a><!--
/TMPL_UNLESS --></td></tr>
-<tr><th scope="row"><label for="subject">Subject</label></th><td>
- <input type="hidden" name="marclist"
value="bibliosubject.subject" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains"
/>
- <input type="text" id="subject" name="value" size="35"
/><!-- TMPL_UNLESS NAME="Disable_Dictionary" --><a
href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&type=intranet&index=3',3)"><strong>...</strong></a><!--
/TMPL_UNLESS --></td></tr>
-<tr><th scope="row"><label for="seriestitle">Series title</label></th><td>
- <input type="hidden" name="marclist"
value="biblio.seriestitle" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" id="seriestitle" name="value"
size="35"/></td></tr>
-
-<tr><th scope="row"><label for="itemtype">Format</label></th><td><input
type="hidden" name="marclist" value="biblioitems.itemtype" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="=" />
- <!-- TMPL_VAR name="CGIitemtype" --></td></tr>
-<tr><th scope="row"><label for="branch">Location</label></th><td><input
type="hidden" name="marclist" value="items.homebranch" />
- <input type="hidden" name="and_or" value="and"
/>
- <input type="hidden" name="excluding" value=""
/>
- <input type="hidden" name="operator" value="="
/>
- <!-- TMPL_VAR name="CGIbranch" --></td></tr>
-</table>
-<p><input type="submit" value="Search" /></p>
-<table>
-<caption>Other options:</caption>
-<tr><th scope="row"><label for="barcode">Barcode</label></th><td>
- <input type="hidden" name="marclist"
value="items.barcode" />
- <input type="hidden" name="and_or" value="and"
/>
- <input type="hidden" name="excluding" value=""
/>
- <input type="hidden" name="operator" value="="
/>
- <input type="text" id="barcode" name="value"
size="14" maxlength="14" /></td></tr>
-<tr><th scope="row"><label for="dewey">Call Number</label></th><td><input
type="hidden" name="marclist" value="biblioitems.dewey" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="start" />
- <input type="text" id="dewey" name="value" /></td></tr>
-<tr><th scope="row"><label for="isbn">ISBN</label></th><td><input
type="hidden" name="marclist" value="biblioitems.isbn" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="start" />
- <input type="text" id="isbn" name="value" /></td></tr>
-<tr><th scope="row"><label for="publisher">Publisher</label></th><td><input
type="hidden" name="marclist" value="biblioitems.publishercode" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="contains" />
- <input type="text" id="publisher" name="value"
/></td></tr>
-<tr><th scope="row"><label for="pubbetween">Published
between</label></th><td><input type="hidden" name="marclist"
value="biblioitems.publicationyear" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value=">=" />
- <input type="text" id="pubbetween" name="value"
size="6" maxlength="4" /></td></tr>
-<tr><th scope="row"><label for="puband">...and</label></th><td><input
type="hidden" name="marclist" value="biblioitems.publicationyear" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="<=" />
- <input type="text" id="puband" name="value" size="6"
maxlength="4" /></td></tr>
-</table>
- <p><input type="submit" value="Search" /></p>
-</form>
-
-<!-- Hide from NPL --><div class="content-block">
-<h3>Recent acquisitions</h3>
- <form action="/cgi-bin/koha/opac-search.pl">
- <p>
- <!-- TMPL_VAR name="CGIitemtype" --> acquired recently
(the most recent being first)
- <input type="hidden" name="marclist"
value="biblioitems.itemtype" />
- <input type="hidden" name="and_or" value="and" />
- <input type="hidden" name="excluding" value="" />
- <input type="hidden" name="operator" value="=" />
- <input type="hidden" name="op" value="do_search" />
- <input type="hidden" name="type" value="opac" />
- <input type="hidden" name="orderby"
value="biblio.timestamp desc" />
- <input type="submit" value="Search" />
- </p>
- </form>
-</div><!-- /Hide from NPL -->
-<script type="text/javascript">
-function sql_update() {
-document.f.sql.value="";
- for (i=0 ; i<document.f.marclist.length ; i++) {
- if (document.f.value[i].value.length>0) {
- document.f.sql.value = document.f.sql.value+
-
document.f.and_or[i].value + ' (' +
-
document.f.excluding[i].value + ' ' +
-
document.f.marclist[i].value + ' ' +
-
document.f.operator[i].value + ' ' +
-
'\''+document.f.value[i].value + '\') ';
- }
- }
-}
-
-function AddStatement() {
-
- document.forms[0].op.value="AddStatement";
- document.f.submit();
-}
-
-function PopupSuggestion() {
- var strQuery="";
- for (i=0 ; i<document.f.marclist.length ; i++) {
- if (document.f.value[i].value.length>0) {
- strQuery += " "+document.f.value[i].value;
- }
- }
-
newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
-</script>
-
-
-</div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Biblio.pm C4/Reserves2.pm C4/Search.pm ... [rel_3_0],
Antoine Farnault <=