You searched on supplier , results found

@@ -9,7 +10,7 @@ Order Receive Company - Exisiting Baskets + Basket @@ -23,6 +24,7 @@ &op=display">

+ @@ -30,6 +32,9 @@ + + + From rch at liblime.com Mon Jan 1 02:11:59 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:11:59 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbi... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:11:59 Modified files: koha-tmpl/intranet-tmpl/npl/en/acqui: newbiblio.tmpl Log message: hide gst if no gst CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.5.2.1&r2=1.2.2.5.2.2 Patches: Index: newbiblio.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbiblio.tmpl,v retrieving revision 1.2.2.5.2.1 retrieving revision 1.2.2.5.2.2 diff -u -b -r1.2.2.5.2.1 -r1.2.2.5.2.2 --- newbiblio.tmpl 11 Jul 2006 14:03:23 -0000 1.2.2.5.2.1 +++ newbiblio.tmpl 1 Jan 2007 01:11:59 -0000 1.2.2.5.2.2 @@ -67,7 +67,7 @@

-" /> +" /> --> @@ -154,7 +154,7 @@ " />

- + From rch at liblime.com Mon Jan 1 02:12:31 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:12:31 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui baske... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:12:31 Modified files: koha-tmpl/intranet-tmpl/npl/en/acqui: basket.tmpl Log message: unhide new_biblio since it works now CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.4&r2=1.2.2.4.2.5 Patches: Index: basket.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v retrieving revision 1.2.2.4.2.4 retrieving revision 1.2.2.4.2.5 diff -u -b -r1.2.2.4.2.4 -r1.2.2.4.2.5 --- basket.tmpl 20 Dec 2006 06:12:35 -0000 1.2.2.4.2.4 +++ basket.tmpl 1 Jan 2007 01:12:31 -0000 1.2.2.4.2.5 @@ -1,5 +1,6 @@ Koha -- New Shopping Basket () for +

@@ -140,7 +141,7 @@ ">

From an existing record:
&basketno=">From a Suggestion
&basketno=">New Record

From rch at liblime.com Mon Jan 1 02:15:18 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:15:18 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui sugge... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:15:18 Modified files: koha-tmpl/intranet-tmpl/npl/en/acqui: suggestion-select.tmpl Log message: add some acqui links CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.1&r2=1.1.2.2.2.2 Patches: Index: suggestion-select.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/suggestion-select.tmpl,v retrieving revision 1.1.2.2.2.1 retrieving revision 1.1.2.2.2.2 diff -u -b -r1.1.2.2.2.1 -r1.1.2.2.2.2 --- suggestion-select.tmpl 11 Jul 2006 14:03:23 -0000 1.1.2.2.2.1 +++ suggestion-select.tmpl 1 Jan 2007 01:15:17 -0000 1.1.2.2.2.2 @@ -1,9 +1,11 @@ Koha -- Acquisitions: Suggestions +

+ [ Manage Suggestions ]

Basket	Items	Date
No pending basket

Budgeted Cost	" readonly="readonly" />
Budgeted GST	readonly="readonly" />
Budgeted GST	readonly="readonly" />
BUDGETED TOTAL	readonly="readonly" />
Actual Cost	" readonly="readonly" />
Invoice Number *	" />

@@ -60,3 +62,4 @@ \ No newline at end of file + From rch at liblime.com Mon Jan 1 02:43:51 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:43:51 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:43:50 Modified files: koha-tmpl/intranet-tmpl/npl/en/acqui: acquire.tmpl Log message: tmpl ifs for cgi itype and location (itemlevel) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.4&r2=1.1.2.3.2.5 Patches: Index: acquire.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acquire.tmpl,v retrieving revision 1.1.2.3.2.4 retrieving revision 1.1.2.3.2.5 diff -u -b -r1.1.2.3.2.4 -r1.1.2.3.2.5 --- acquire.tmpl 1 Jan 2007 00:35:47 -0000 1.1.2.3.2.4 +++ acquire.tmpl 1 Jan 2007 01:43:50 -0000 1.1.2.3.2.5 @@ -88,13 +88,17 @@ + + - + From rch at liblime.com Mon Jan 1 02:45:40 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:45:40 +0000 Subject: [Koha-cvs] koha/acqui acquire.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:45:40 Modified files: acqui : acquire.pl Log message: adding multiple new item adds for acqui. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/acquire.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.18.2.4.2.1&r2=1.18.2.4.2.2 Patches: Index: acquire.pl =================================================================== RCS file: /sources/koha/koha/acqui/Attic/acquire.pl,v retrieving revision 1.18.2.4.2.1 retrieving revision 1.18.2.4.2.2 diff -u -b -r1.18.2.4.2.1 -r1.18.2.4.2.2 --- acquire.pl 27 Jul 2006 15:41:16 -0000 1.18.2.4.2.1 +++ acquire.pl 1 Jan 2007 01:45:40 -0000 1.18.2.4.2.2 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: acquire.pl,v 1.18.2.4.2.1 2006/07/27 15:41:16 kados Exp $ +# $Id: acquire.pl,v 1.18.2.4.2.2 2007/01/01 01:45:40 rych Exp $ #script to recieve orders #written by chris at katipo.co.nz 24/2/2000 @@ -25,6 +25,7 @@ use strict; use CGI; use C4::Context; +use C4::Koha; use C4::Acquisition; use C4::Biblio; use C4::Output; @@ -63,25 +64,41 @@ $template->param($count); if ($count == 1){ my $sth; -# my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description"); -# $sth->execute; -# my @itemtype; -# my %itemtypes; -# push @itemtype, ""; -# $itemtypes{''} = "Please choose"; -# while (my ($value,$lib) = $sth->fetchrow_array) { -# push @itemtype, $value; -# $itemtypes{$value}=$lib; -# } -# -# my $CGIitemtype=CGI::scrolling_list( -name => 'format', -# -values => \@itemtype, -# -default => $results[0]->{'itemtype'}, -# -labels => \%itemtypes, -# -size => 1, -# -tabindex=>'', -# -multiple => 0 ); -# $sth->finish; + my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description"); + $sth->execute; + my @itemtype; + my %itemtypes; + push @itemtype, ""; + $itemtypes{''} = "Please choose"; + while (my ($value,$lib) = $sth->fetchrow_array) { + push @itemtype, $value; + $itemtypes{$value}=$lib; + } + $sth->finish; + + if ( C4::Context->preference('item-level_itypes')) { + my $CGIitemtype=CGI::scrolling_list( -name => 'itype', + -values => \@itemtype, + -default => $results[0]->{'itemtype'}, + -labels => \%itemtypes, + -size => 1, + -tabindex=>'', + -multiple => 0 ); + $template->param( CGIitype=> $CGIitemtype,); + } + + my $locations = getKohaAuthorisedValues($dbh, 'items.location'); + if ($locations ) { + my @location_codes = keys %$locations; + my $CGIlocation=CGI::scrolling_list( -name => 'location', + -values => \@location_codes, + -default => $results[0]->{'itemtype'}, + -labels => $locations, + -size => 1, + -tabindex=>'', + -multiple => 0 ); + $template->param( CGIlocation => $CGIlocation ); + } my @branches; my @select_branch; @@ -99,6 +116,7 @@ -tabindex=>'', -multiple => 0 ); + my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0; # See whether barcodes should be automatically allocated. # Defaults to 0, meaning "no". @@ -154,6 +172,7 @@ barcode => $barcode, bookfund => $results[0]->{'bookfundid'}, quantity => $results[0]->{'quantity'}, + quantityreceivedplus1 => $results[0]->{'quantityreceived'} + 1, quantityreceived => $results[0]->{'quantityreceived'}, rrp => $results[0]->{'rrp'}, ecost => $results[0]->{'ecost'}, From rch at liblime.com Mon Jan 1 02:49:44 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:49:44 +0000 Subject: [Koha-cvs] koha/acqui addorder.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:49:44 Modified files: acqui : addorder.pl Log message: Biblio::newbiblio takes a $record object now. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/addorder.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.24.2.2&r2=1.24.2.2.2.1 Patches: Index: addorder.pl =================================================================== RCS file: /sources/koha/koha/acqui/addorder.pl,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.2.2.1 diff -u -b -r1.24.2.2 -r1.24.2.2.2.1 --- addorder.pl 1 Dec 2005 17:27:55 -0000 1.24.2.2 +++ addorder.pl 1 Jan 2007 01:49:44 -0000 1.24.2.2.2.1 @@ -22,6 +22,7 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; + use CGI; use C4::Auth; use C4::Output; @@ -83,11 +84,13 @@ # delete if $quantity has been se to 0 by the librarian my $bibnum; my $bibitemnum; +my $record; if ($quantity ne '0'){ #check to see if biblio exists if ($existing eq 'no'){ #if it doesnt create it - $bibnum = &newbiblio({ title => $title?$title:"", + + ($bibnum, $record) = &newbiblio({ title => $title?$title:"", author => $author?$author:"", copyrightdate => $copyrightdate?$copyrightdate:"", series => $series?$series:"", @@ -96,7 +99,7 @@ itemtype => $itemtype?$itemtype:"", isbn => $isbn?$isbn:"", publishercode => $publishercode?$publishercode:"", - }); + }, $record); # change suggestion status if applicable if ($suggestionid) { changestatus($suggestionid,'ORDERED','',$bibnum); From rch at liblime.com Mon Jan 1 02:52:58 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:52:58 +0000 Subject: [Koha-cvs] koha/acqui basket.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:52:58 Modified files: acqui : basket.pl Log message: sync with rel22 CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.24.2.9&r2=1.24.2.9.2.1 Patches: Index: basket.pl =================================================================== RCS file: /sources/koha/koha/acqui/basket.pl,v retrieving revision 1.24.2.9 retrieving revision 1.24.2.9.2.1 diff -u -b -r1.24.2.9 -r1.24.2.9.2.1 --- basket.pl 5 Feb 2006 21:59:21 -0000 1.24.2.9 +++ basket.pl 1 Jan 2007 01:52:58 -0000 1.24.2.9.2.1 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: basket.pl,v 1.24.2.9 2006/02/05 21:59:21 kados Exp $ +# $Id: basket.pl,v 1.24.2.9.2.1 2007/01/01 01:52:58 rych Exp $ #script to show display basket of orders #written by chris at katipo.co.nz 24/2/2000 @@ -54,6 +54,10 @@ # warn "=>".$basket->{booksellerid}; $booksellerid = $basket->{booksellerid} unless $booksellerid; my ($count2, at booksellers)=bookseller($booksellerid); +$booksellers[0]->{'postal'} =~ s/\n//g; + +# get branches information, to show branchaddress in template +my $branches = getbranches(); # get librarian branch... if (C4::Context->preference("IndependantBranches")) { @@ -73,7 +77,7 @@ # if new basket, pre-fill infos $basket->{creationdate} = "" unless ($basket->{creationdate}); -$basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby}); +$basket->{authorisedbyname} = $loggedinuser unless ($basket->{authorisedbyname}); ($count, at results)=getbasketcontent($basketno,'',$order); my $line_total; # total of each line @@ -123,30 +127,28 @@ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist); $gist_est = sprintf("%.2f",$sub_total_est*$prefgist); $template->param(basketno => $basketno, - creationdate => $basket->{creationdate}, - authorisedby => $basket->{authorisedby}, + creationdate => format_date($basket->{creationdate}), authorisedbyname => $basket->{authorisedbyname}, closedate => format_date($basket->{closedate}), active => $booksellers[0]->{'active'}, booksellerid=> $booksellers[0]->{'id'}, name => $booksellers[0]->{'name'}, - address1 => $booksellers[0]->{'address1'}, - address2 => $booksellers[0]->{'address2'}, - address3 => $booksellers[0]->{'address3'}, - address4 => $booksellers[0]->{'address4'}, + postal => $booksellers[0]->{'postal'}, entrydate => format_date($results[0]->{'entrydate'}), books_loop => \@books_loop, count =>$count, - sub_total => $sub_total, - gist => $gist, - grand_total =>$grand_total, - sub_total_est => $sub_total_est, - gist_est => $gist_est, - grand_total_est =>$grand_total_est, + sub_total => sprintf("%.2f",$sub_total), + gist => sprintf("%.2f",$gist), + grand_total =>sprintf("%.2f",$grand_total), + sub_total_est => sprintf("%.2f",$sub_total_est), + gist_est => sprintf("%.2f",$gist_est), + grand_total_est =>sprintf("%.2f",$grand_total_est), currency => $booksellers[0]->{'listprice'}, qty_total => $qty_total, - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), + GST => C4::Context->preference("gist"), + branchname => $branches->{C4::Context->userenv->{branch}}->{branchname}, + branchaddress1 => $branches->{C4::Context->userenv->{branch}}->{branchaddress1}, + branchaddress2 => $branches->{C4::Context->userenv->{branch}}->{branchaddress2}, + branchaddress3 => $branches->{C4::Context->userenv->{branch}}->{branchaddress3}, ); output_html_with_http_headers $query, $cookie, $template->output; From rch at liblime.com Mon Jan 1 02:54:19 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:54:19 +0000 Subject: [Koha-cvs] koha/acqui finishreceive.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:54:19 Modified files: acqui : finishreceive.pl Log message: changing call to Biblio::newitems to allow creation of multiple items from acqui interface. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.17.4.1&r2=1.17.4.2 Patches: Index: finishreceive.pl =================================================================== RCS file: /sources/koha/koha/acqui/finishreceive.pl,v retrieving revision 1.17.4.1 retrieving revision 1.17.4.2 diff -u -b -r1.17.4.1 -r1.17.4.2 --- finishreceive.pl 27 Jul 2006 15:41:16 -0000 1.17.4.1 +++ finishreceive.pl 1 Jan 2007 01:54:19 -0000 1.17.4.2 @@ -43,7 +43,8 @@ my $gst=$input->param('gst'); my $freight=$input->param('freight'); my $supplierid = $input->param('supplierid'); -my $branch=$input->param('branch'); + + # if ($quantrec != 0){ # $cost /= $quantrec; @@ -53,16 +54,33 @@ # save the quantity recieved. $datereceived = receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$datereceived,$freight,$replacement); # create items if the user has entered barcodes - my $barcode=$input->param('barcode'); - my @barcodes=split(/\,| |\|/,$barcode); - my ($error) = newitems({ biblioitemnumber => $bibitemno, + my @barcode=$input->param('barcode'); + my @itemcallnumber=$input->param('itemcallnumber'); + my @branch=$input->param('branch'); + my @itype = $input->param('itype'); + my @location = $input->param('location'); + my $index = 0; + my @items; +#FIXME -ASSUMES every item needs a barcode. + + foreach my $barcode (@barcode) { + push @items, { biblioitemnumber => $bibitemno, biblionumber => $biblionumber, replacementprice => $replacement, price => $cost, booksellerid => $supplierid, - homebranch => $branch, - loan => 0 }, - @barcodes); + loan => 0 , + + barcode => $barcode[$index], + homebranch => $branch[$index], + itemcallnumber => $itemcallnumber[$index], + itype => $itype[$index], + location => $location[$index], + }; + $index++; + } + my ($error) = newitems( \@items ); + print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived"); } else { print $input->header; From rch at liblime.com Mon Jan 1 02:55:53 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 01:55:53 +0000 Subject: [Koha-cvs] koha/acqui receive.pl [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 01:55:53 Modified files: acqui : receive.pl Log message: add tmpl var for quant received CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/acqui/receive.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.13.2.5.2.2&r2=1.13.2.5.2.3 Patches: Index: receive.pl =================================================================== RCS file: /sources/koha/koha/acqui/Attic/receive.pl,v retrieving revision 1.13.2.5.2.2 retrieving revision 1.13.2.5.2.3 diff -u -b -r1.13.2.5.2.2 -r1.13.2.5.2.3 --- receive.pl 3 Dec 2006 21:57:38 -0000 1.13.2.5.2.2 +++ receive.pl 1 Jan 2007 01:55:53 -0000 1.13.2.5.2.3 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: receive.pl,v 1.13.2.5.2.2 2006/12/03 21:57:38 rych Exp $ +# $Id: receive.pl,v 1.13.2.5.2.3 2007/01/01 01:55:53 rych Exp $ #script to recieve orders #written by chris at katipo.co.nz 24/2/2000 @@ -82,6 +82,7 @@ $line{unitprice} = $parcelitems[$i]->{'unitprice'}; $line{ecost} = $parcelitems[$i]->{'ecost'}; $line{quantityrecieved} = $parcelitems[$i]->{'quantityreceived'}; + $line{quantityrecievedplus1} = $parcelitems[$i]->{'quantityreceived'} + 1; $line{quantity} = $parcelitems[$i]->{'quantity'}; $line{total} = $total; $line{supplierid} = $supplierid; From rch at liblime.com Mon Jan 1 03:14:33 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 02:14:33 +0000 Subject: [Koha-cvs] koha/C4 Koha.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 02:14:33 Modified files: C4 : Koha.pm Log message: adding authorisedvalue routine CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.8&r2=1.22.2.4.2.9 Patches: Index: Koha.pm =================================================================== RCS file: /sources/koha/koha/C4/Koha.pm,v retrieving revision 1.22.2.4.2.8 retrieving revision 1.22.2.4.2.9 diff -u -b -r1.22.2.4.2.8 -r1.22.2.4.2.9 --- Koha.pm 4 Dec 2006 05:19:36 -0000 1.22.2.4.2.8 +++ Koha.pm 1 Jan 2007 02:14:33 -0000 1.22.2.4.2.9 @@ -63,6 +63,7 @@ &GetCcodes &GetAuthItemlost &GetAuthItembinding + &getKohaAuthorisedValues &getitemtypeinfo &getframeworks &getframeworkinfo @@ -782,7 +783,9 @@ { link_value => 'branch', label_value => 'Branches', +# tags => ['959',], tags => ['952',], +# subfield => 'n', subfield => 'b', expanded => '1', }, @@ -1093,6 +1096,30 @@ return @languages_options; } +=head2 getKohaAuthorisedValues + + Takes $dbh , $kohafield as parameters. + returns hashref of authvalCode => liblibrarian + or undef if no authvals defined for kohafield. + +=cut + +sub getKohaAuthorisedValues { + my ($dbh, $kohafield) = @_; + my %values; + my $sthnflstatus = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield=?'); + $sthnflstatus->execute($kohafield); + my $authorised_valuecode = $sthnflstatus->fetchrow; + if ($authorised_valuecode) { + $sthnflstatus = $dbh->prepare("select authorised_value, lib from authorised_values where category=? "); + $sthnflstatus->execute($authorised_valuecode); + while ( my ($val, $lib) = $sthnflstatus->fetchrow_array ) { + $values{$val}= $lib; + } + } + return \%values; +} + 1; __END__ From rch at liblime.com Mon Jan 1 04:23:37 2007 From: rch at liblime.com (Ryan Higgins) Date: Mon, 01 Jan 2007 03:23:37 +0000 Subject: [Koha-cvs] koha/C4 Biblio.pm [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/01 03:23:37 Modified files: C4 : Biblio.pm Log message: passing $record object between newbiblio and newbiblioitem, etc, so we can add a minimal marc record in acquisitions, and then add multiple associated items. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.42&r2=1.115.2.51.2.43 Patches: Index: Biblio.pm =================================================================== RCS file: /sources/koha/koha/C4/Biblio.pm,v retrieving revision 1.115.2.51.2.42 retrieving revision 1.115.2.51.2.43 diff -u -b -r1.115.2.51.2.42 -r1.115.2.51.2.43 --- Biblio.pm 28 Nov 2006 14:43:18 -0000 1.115.2.51.2.42 +++ Biblio.pm 1 Jan 2007 03:23:36 -0000 1.115.2.51.2.43 @@ -1206,18 +1206,20 @@ sub MARCkoha2marcBiblio { # this function builds partial MARC::Record from the old koha-DB fields - my ( $dbh, $biblionumber, $biblioitemnumber ) = @_; - my $sth = - $dbh->prepare( -"select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?" + my ( $dbh, $biblionumber, $biblioitemnumber, $record ) = @_; + my $sth = $dbh->prepare( + "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?" ); - my $record = MARC::Record->new(); + if ( ! $record ) { + $record = MARC::Record->new(); + $record->encoding('UTF-8'); + } #--- if bibid, then retrieve old-style koha data if ( $biblionumber > 0 ) { - my $sth2 = - $dbh->prepare( -"select biblionumber,author,title,unititle,notes,abstract,serial,seriestitle,copyrightdate,timestamp + $record = addBiblionumber ( $dbh, $record, $biblionumber, $biblioitemnumber ); + my $sth2 = $dbh->prepare( + "select biblionumber,author,title,unititle,notes,abstract,serial,seriestitle,copyrightdate,timestamp from biblio where biblionumber=?" ); $sth2->execute($biblionumber); @@ -1992,8 +1994,7 @@ sub _koha_new_items { my ( $dbh, $item, $barcode ) = @_; - - # my $dbh = C4Connect; + $barcode = $item->{'barcode'} unless ($barcode); my $sth = $dbh->prepare("Select max(itemnumber) from items"); my $data; my $itemnumber; @@ -2003,7 +2004,6 @@ $data = $sth->fetchrow_hashref; $itemnumber = $data->{'max(itemnumber)'} + 1; $sth->finish; - $sth->finish; ## Now calculate lccalnumber my ($cutterextra)=itemcalculator($dbh,$item->{'biblioitemnumber'},$item->{'itemcallnumber'}); # FIXME the "notforloan" field seems to be named "loan" in some places. workaround bugfix. @@ -2400,7 +2400,7 @@ # my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum); my $record = &MARCkoha2marcBiblio( $dbh, $bibnum ); MARCaddbiblio( $dbh, $record, $bibnum,'' ); - return ($bibnum); + return ($bibnum , $record ); } =item modsubtitle @@ -2471,16 +2471,16 @@ } sub newbiblioitem { - my ($biblioitem) = @_; + my ($biblioitem, $record ) = @_; my $dbh = C4::Context->dbh; my $bibitemnum = &_koha_add_biblioitem( $dbh, $biblioitem ); my $MARCbiblio = - MARCkoha2marcBiblio( $dbh, 0, $bibitemnum ) + MARCkoha2marcBiblio( $dbh, 0, $bibitemnum, $record ) ; # the 0 means "do NOT retrieve biblio, only biblioitem, in the MARC record &MARCaddbiblio( $dbh, $MARCbiblio, $biblioitem->{biblionumber}, '' ); - return ($bibitemnum); + return ($bibitemnum, $record); } sub newsubject { @@ -2496,13 +2496,13 @@ } sub newitems { - my ( $item, @barcodes ) = @_; + my ( $items ) = @_; my $dbh = C4::Context->dbh; my $errors; my $itemnumber; my $error; - foreach my $barcode (@barcodes) { - ( $itemnumber, $error ) = &_koha_new_items( $dbh, $item, uc($barcode) ); + foreach my $item (@$items) { + ( $itemnumber, $error ) = &_koha_new_items( $dbh, $item ); $errors .= $error; my $MARCitem = &MARCkoha2marcItem( $dbh, $item->{biblionumber}, $itemnumber ); &MARCadditem( $dbh, $MARCitem, $item->{biblionumber} ); @@ -3137,7 +3137,7 @@ $recordSyntax = "xml" unless $recordSyntax; my $Zconn = C4::Context->Zconn($server,0,1,1,$recordSyntax); my $rs = $Zconn->search(new ZOOM::Query::CCL2RPN($koha_query,$Zconn)); - if ($rs->record(0)) { + if ($rs->size() > 0) { return $rs->record(0)->raw(); } } @@ -3158,8 +3158,11 @@ =cut -# $Id: Biblio.pm,v 1.115.2.51.2.42 2006/11/28 14:43:18 kados Exp $ +# $Id: Biblio.pm,v 1.115.2.51.2.43 2007/01/01 03:23:36 rych Exp $ # $Log: Biblio.pm,v $ +# Revision 1.115.2.51.2.43 2007/01/01 03:23:36 rych +# passing $record object between newbiblio and newbiblioitem, etc, so we can add a minimal marc record in acquisitions, and then add multiple associated items. +# # Revision 1.115.2.51.2.42 2006/11/28 14:43:18 kados # deleteditems table wasn't getting populaated because the execute was commented out. This puts it back # -- some table changes are needed as well, I'll commit those separately. From rch at liblime.com Tue Jan 2 17:38:33 2007 From: rch at liblime.com (Ryan Higgins) Date: Tue, 02 Jan 2007 16:38:33 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/z3950 searc... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Ryan Higgins 07/01/02 16:38:33 Modified files: koha-tmpl/intranet-tmpl/npl/en/z3950: searchresult.tmpl Log message: adding error msg for import failure CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.2.2.3&r2=1.2.2.2.2.4 Patches: Index: searchresult.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/Attic/searchresult.tmpl,v retrieving revision 1.2.2.2.2.3 retrieving revision 1.2.2.2.2.4 diff -u -b -r1.2.2.2.2.3 -r1.2.2.2.2.4 --- searchresult.tmpl 3 Nov 2006 00:33:04 -0000 1.2.2.2.2.3 +++ searchresult.tmpl 2 Jan 2007 16:38:33 -0000 1.2.2.2.2.4 @@ -56,7 +56,7 @@ - + @@ -69,8 +69,13 @@

Still servers to search

From paul at koha-fr.org Wed Jan 3 09:38:55 2007 From: paul at koha-fr.org (paul poulain) Date: Wed, 03 Jan 2007 08:38:55 +0000 Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-advsearch... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/03 08:38:55 Modified files: koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl Log message: removing some option when advsearch=no CVSWeb URLs: 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.8&r2=1.1.2.9 Patches: Index: opac-advsearch.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -b -r1.1.2.8 -r1.1.2.9 --- opac-advsearch.tmpl 22 Dec 2006 17:38:31 -0000 1.1.2.8 +++ opac-advsearch.tmpl 3 Jan 2007 08:38:54 -0000 1.1.2.9 @@ -64,7 +64,9 @@ + + @@ -74,12 +76,14 @@ + + - + @@ -413,6 +417,7 @@

Location and availability:

Branch"> + "> + +
- ">">">"> - + "> + "> + "> + "> + + + +
- " name="bib"> - + " name="bib"> + + + - -

Filter Suggestion Results
Branch:
Item type:
Location:	+ " /> +
Item CallNumber:		,)">Import	'-1',,'')">Import

From btoumi at ouestprovence.fr Wed Jan 3 17:18:47 2007 From: btoumi at ouestprovence.fr (Bruno Toumi) Date: Wed, 03 Jan 2007 16:18:47 +0000 Subject: [Koha-cvs] koha/members memberentry.pl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Bruno Toumi 07/01/03 16:18:47 Modified files: members : memberentry.pl Log message: add function to format firstname field in borrowers module CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.21&r2=1.38.2.22 Patches: Index: memberentry.pl =================================================================== RCS file: /sources/koha/koha/members/memberentry.pl,v retrieving revision 1.38.2.21 retrieving revision 1.38.2.22 diff -u -b -r1.38.2.21 -r1.38.2.22 --- memberentry.pl 22 Dec 2006 15:45:42 -0000 1.38.2.21 +++ memberentry.pl 3 Jan 2007 16:18:47 -0000 1.38.2.22 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: memberentry.pl,v 1.38.2.21 2006/12/22 15:45:42 btoumi Exp $ +# $Id: memberentry.pl,v 1.38.2.22 2007/01/03 16:18:47 btoumi Exp $ # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN # @@ -464,7 +464,6 @@ else { $step++; } - $template->param( BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript category_type => $category_type,#to know the category type of the borrower @@ -480,7 +479,7 @@ borrowernumber => $borrowernumber,#register number cardnumber => $data{'cardnumber'}, surname => uc($data{'surname'}), - firstname => ucfirst($data{'firstname'}), + firstname => ucfirst(lc $data{'firstname'}), title => $data{'title'}, othernames => $data{'othernames'}, initials => $data{'initials'}, @@ -510,7 +509,7 @@ gonenoaddress => $data{'gonenoaddress'}, lost => $data{'lost'}, contactname => uc($data{'contactname'}), - contactfirstname=> ucfirst($data{'contactfirstname'}), + contactfirstname=> ucfirst( lc $data{'contactfirstname'}), "contacttitle_".$data{'contacttitle'} => "SELECTED" , contacttitle => $data{'contacttitle'}, guarantorid => $guarantorid, From kyle.m.hall at gmail.com Wed Jan 3 17:39:58 2007 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Wed, 03 Jan 2007 16:39:58 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelv... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 07/01/03 16:39:58 Modified files: koha-tmpl/intranet-tmpl/ccfls/en/bookshelves: addbookbybiblionumber.tmpl shelves.tmpl Log message: CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/addbookbybiblionumber.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2 Patches: Index: addbookbybiblionumber.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/Attic/addbookbybiblionumber.tmpl,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- addbookbybiblionumber.tmpl 30 Nov 2006 15:56:27 -0000 1.1.2.1.2.1 +++ addbookbybiblionumber.tmpl 3 Jan 2007 16:39:58 -0000 1.1.2.1.2.2 @@ -1,41 +1,4 @@ - - - - -

- -

Virtual Shelves: Add to Virtual Shelf: - +Koha -- Add to Virtual Shelf

Add by to a Virtual Shelf

@@ -60,16 +23,4 @@
- -
-
-
-
-
-
-
-

- - - + Index: shelves.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/Attic/shelves.tmpl,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2 --- shelves.tmpl 30 Nov 2006 15:56:27 -0000 1.1.2.1.2.1 +++ shelves.tmpl 3 Jan 2007 16:39:58 -0000 1.1.2.1.2.2 @@ -1,6 +1,7 @@ - - - +Koha -- Virtual Shelves + + +

@@ -159,16 +160,4 @@

- -
-
-
-
-
-
-
- - - - - + From kyle.m.hall at gmail.com Wed Jan 3 17:56:43 2007 From: kyle.m.hall at gmail.com (Kyle Hall) Date: Wed, 03 Jan 2007 16:56:43 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en/includes ... [dev_week] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: dev_week Changes by: Kyle Hall 07/01/03 16:56:43 Modified files: koha-tmpl/intranet-tmpl/ccfls/en/includes: intranet.css Log message: CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1 Patches: Index: intranet.css =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/Attic/intranet.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.1.2.1 diff -u -b -r1.1.2.1 -r1.1.2.1.2.1 --- intranet.css 12 Apr 2006 18:34:06 -0000 1.1.2.1 +++ intranet.css 3 Jan 2007 16:56:43 -0000 1.1.2.1.2.1 @@ -1,1300 +1,1184 @@ -#issued { - font-style: italic; - color: #666666; +a.delete { + display: block; + font-weight: bold; + margin: 2px; + padding: 1px; + text-align: center; + text-decoration: none; } -a:link { - color : #0066CC; +a.edit { + display: block; + font-weight: bold; + margin: 2px; + padding: 1px; + text-align: center; + text-decoration: none; } -a:visited { - color : #0066CC; +a:link.current { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a:hover { - color : #993300; +a:link.pages { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a.delete { - background-color : #CC3333; - color : #FFFF99; - display : block; - font-weight : bold; - margin : 2px; - padding : 1px; - text-align : center; - text-decoration : none; +a:visited.current { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a.delete:hover { - background-color : #FF3333; - color : #FFFF99; +a:visited.pages { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a.edit { - background-color : #CCFF00; - color : #3366CC; - display : block; - font-weight : bold; - margin : 2px; - padding : 1px; - text-align : center; - text-decoration : none; +a:hover.current { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a.edit:hover { - background-color : #CCFF99; - color : #000088; +a:hover.pages { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a:link.current { - background-color : transparent; - color : #3366CC; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +a:active.current { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a:link.current { - background-color : transparent; - color : #3366CC; +a:active.pages { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -a:link.nav { - background-color : #D8DEB8; - color : #3366CC; +a.button { + font-size: 80%; + font-weight: bold; + margin : 2px 0; + padding : 3px; + text-decoration: none; } -a:link.pages { - background-color : #CCCCCC; - color : #3366CC; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +body { + font-family: arial, geneva, sans-serif; + font-size: 16px; + margin: 3px 0px 0px 5px; } -a:visited.current { - background-color : transparent; - color : #3366CC; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +br.clear { + clear : both; + line-height: 1px; } -a:visited.current { - background-color : transparent; - color : #3366CC; +caption { + font-size: 20px; + font-weight: bold; + margin-top: 5px; + text-align: left; } -a:visited.nav { - background-color : #D8DEB8; - color : #3366CC; +div.controls { + display : block; + font-size: 70%; + font-weight: bold; + margin-top: .4em; + margin-bottom : .4em; + padding-top : .4em; } -a:visited.pages { - background-color : #CCCCCC; - color : #3366CC; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +div#help { + font-weight: bold; + position: absolute; + right: 3px; + top: 3px; } -a:hover.current { - background-color : #CCFF00; - color : #CC3333; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +div#help .loggedin, .menu input { + font-size: 80%; } -a:hover.current { - background-color : #CCFF00; - color : #CC3333; +div#help .loggedin a { + text-decoration: underline; } -a:hover.nav { - background-color : #CCFF00; - color : #CC3333; +div#help a { + padding: 1px 2px; + text-decoration: none; } -a:hover.pages { - background-color : #CCFF00; - color : #CC3333; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +div.basket { + background-color : #F0F0F0; + padding : 5px; + margin-bottom : 10px; } -a:active.current { - background-color : #99CC00; - color : #FFFF99; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +div.basket table { + background-color : White; + border-collapse : collapse; + border-top : 1px solid #666666; + border-right : 1px solid #666666; } -a:active.current { - background-color : #99CC00; - color : #FFFF99; +div.basket table td, div.basket table th { + border-left : 1px solid #666666; + border-bottom : 1px solid #666666; } -a:active.nav { - background-color : #99CC00; - color : #FFFF99; +div.basket table td.total { + text-align : right; } -a:active.pages { - background-color : #99CC00; - color : #FFFF99; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +div.box { + width: 45%; + padding: 5px; + float: left; + margin : 3px; + font-size : 76%; } -//Body background-color is white (#CCCCCC) -body { - background-color : #CCCCCC; - color : #333333; - font-family : arial, geneva, sans-serif; - font-size : 16px; - margin : 3px 0px 0px 5px; +div.box table td { + padding : 2px; } -caption { - color : #000066; - font-size : 20px; - font-weight : bold; - margin-top : 5px; - text-align : left; +div.compact td { + font-size: 13px; + font-weight: normal; + padding: 1px 1px 1px 10px; } -div.form, div.details { - background-color : #CCCCCC; - border : 0px; - margin : 0px auto; - padding : 5px; +div.compact th { + padding: 1px 10px 1px 1px; + font-weight: normal; + font-size: 13px; + text-align: right; + width: 20%; + vertical-align: top; } -div.details { - margin-bottom: 5px; +div.data p { + margin: .5em 0; } -div.details dl { - margin : 0px; - padding : 0px; +div.data table caption { + font-size: 1em; } -div.details dt { - font-weight: bold; +div.data table td, div.data-main table td { font-size: 12px; - border-bottom : 1px solid #D8DEB8; - padding : 2px; + margin: 0 0 0 0; + padding: 2px; + padding-left: .7em; } -div.details dd { +div.data table th, div.data-main table th { font-size: 12px; + font-weight: bold; + padding: 2px; + padding-right: 1em; + text-align: right; + width: 17%; } -div.details ul { - margin-top: 0px; - margin-bottom: 0px; - padding-top : 0px; - padding-bottom : 3px; - font-size : 12px; -} - -div#help { - position : absolute; - top : 3px; - right : 3px; - font-weight : bold; +div.data table tr.highlight th { + font-size: 70%; + font-weight: bold; + padding-right: 1em; } -div#help a { - background-color : #3FB2B3; - padding : 1px 2px; - text-decoration : none; +div.data table, div.data-main table { + border-collapse: collapse; + margin: auto; + margin: 0 0 5px 0; } -div#help .loggedin { - color : #cccc99; - font-size : 80%; +div.data-main table caption { + font-size: 1.1em; } -div#help .loggedinusername { - color : #D8DEB8; +div.details { + margin-bottom: 10px; + padding: 5px; } -div#help .loggedin a { - background-color : transparent; - text-decoration : underline; - color : #CCFF66; +div.details dd { + font-size: 12px; } -div.items { - background-color : #CCCCCC; - border : 0px; - margin : 0px auto; - padding : 5px; - width : 100%; +div.details dl { + margin: 0px; + padding: 0px; } -div.items td { - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 1px solid white; - border-top : 1px solid white; - font-size : .75em; +div.details dt { + font-weight: bold; + font-size: 12px; padding: 2px; } -div.items th { - background-color : #FFC; - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 0px; - border-top : 1px solid white; - color : #000088; - font-size: .75em; - font-weight : bold; - padding : 2px; - text-align : left; - vertical-align : top; -} - div.details td, div.form td { - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 0px; - border-top : 0px; } div.details td:first-child, div.form td:first-child { - font-weight : bold; - text-align : right; - width : 25%; + font-weight: bold; + text-align: right; + width: 25%; } div.details td+td, div.form td+td { - font-weight : normal; - text-align : left; - width : 75%; + font-weight: normal; + text-align: left; + width: 75%; } -div.compact td { - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 0px; - border-top : 0px; - font-weight : normal; - font-size : 13px; - padding : 1px 1px 1px 10px; +div.details ul { + margin-top: 0px; + margin-bottom: 0px; + padding-top: 0px; + padding-bottom: 3px; + font-size: 12px; } -div.compact th { - border-bottom : 1px solid #999933; - border-left : 1px solid white; - border-right : 1px solid #999933; - border-top : 0px; - padding : 1px 10px 1px 1px; - font-weight : normal; - font-size : 13px; - text-align : right; - width : 20%; - vertical-align: top; +div.error { + font-size: 16px; + line-height: 18px; + margin: 10px auto; + padding: 5px; + width: 65%; } -div.error { - background-color : #CCCCCC; - border : 1px dashed #CCCCCC; - font-size : 16px; - line-height : 18px; - margin : 10px auto; - padding : 5px; - width : 65%; - font-weight: bold; +div.error .cancel { + font-size: 14px; + margin-left: 5%; + padding: 2px 15px 2px 15px; } div.error .submit { - background-color : #CCCCCC; font-size: 14px; - margin-left : 5%; - padding : 2px 15px 2px 15px; + margin-left: 5%; + padding: 2px 15px 2px 15px; } -div.error .cancel { - background-color : #993300; - font-size: 14px; - margin-left : 5%; - padding : 2px 15px 2px 15px; +div.error p { + margin: 0px; + padding: 0px 0px 0px 20px; } -div.error h3 { - color : #990033; +div.flags li { + list-style: circle; } -div.error p { - margin : 0px; - padding : 0px 0px 0px 20px; +div.flags ul { + margin: 0px; + padding: 0px; } -div.notice { - background-color : #FFFF99; - border : 1px dashed #990000; - font-size : 16px; - line-height : 18px; - margin : 10px auto; - padding : 5px; +div.form { + margin: 0px auto; + padding: 5px; } -div.flags li { - list-style : circle; +div.help { + font-size: 90%; + margin-bottom: 5px; } -div.flags ul { - margin : 0px; - padding : 0px; +div.help .ex { + font-weight: bold; } +div.help h3 { + font-size: 100%; + margin: 0; + padding: 5px; +} +div.help p { + margin: 0; + padding: 2px 5px; +} - div.help { - border : 0; - background-color : white; - font-size : 90%; - margin-bottom : 5px; - } +div.items { + margin: 0px auto; + padding: 5px; + width: 98%; +} - div.help h3 { - font-size : 100%; - background-color : #CCCCCC; - border-bottom : #CCCC99; - margin : 0; - padding : 5px; - } +div.items td { + font-size: .75em; + padding: 2px; +} - div.help p { - margin : 0; - padding : 2px 5px; - } +div.items th { + font-size: .75em; + font-weight: bold; + padding: 2px; + text-align: left; + vertical-align: top; +} - div.help .ex { - font-weight : bold; - } +div.members th { + font-size: 12px; + padding: 3px 5px; + width: 25%; + font-weight: bold; + text-align: left; + vertical-align: top; +} + +div.members th label { + display: block; + margin: 0; + padding: 0; +} + +div.members th p, div.compact th p { + font-weight: normal; + padding: 0; + margin: 0; + text-indent: 1em; +} div.menu { - width : 100%; + margin-bottom : 5px; + padding: 5px; + width: 98%; } -div.menu th { - background-color : #CCCCCC; - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 0px; - border-top : 0px; - font-size : 101%; - font-weight : bold; - text-align : right; - } +div.menu dl { + padding: 0; + margin : 0; +} -div.menu td+td { - font-size : 90%; - font-weight : normal; - text-align : left; +div.menu dt { + font-size : 80%; + font-weight: bold; + padding: 2px; + margin : .3em; +} + +div.menu dd { + font-size: 75%; + margin-left: 1em; +} +div.notice { + font-size: 16px; + line-height: 18px; + margin: 10px auto; + padding: 5px; } div.tabitem { - display : inline; + display: inline; } -div.tabitem form { - display : inline; - white-space : nowrap; +div.tabitem form, div.controls form { + display: inline; + white-space: nowrap; +} + +div.tabitem li a { + font-weight: bold; + padding: 3px 3px; + text-decoration: none; } div.tabitem ul { - margin : 0; - padding : 0; + margin: 0; + padding: 0; } div.tabitem ul li { - font-size : 80%; - margin : 0 2px 0 0; - border-right: 1px solid #999900; - padding : 3px 0; + font-size: 80%; + margin: 0 2px 0 0; + padding: 3px 0; list-style: none; display: inline; - } - -div.tabitem li a { - background-color : white; - font-weight : bold; - padding : 3px 3px; - text-decoration : none; } -div.tabitem li a.here { - background-color : #D8DEB8; -} -div.tabitem li a:hover { - background-color : #CCCCCC; -} -fieldset { - border : 0; - padding : 0; - white-space : nowrap; +fieldset label { + float: left; + margin-left: 3px; + width: 25%; } fieldset.list { - white-space : normal; + white-space: normal; } form { - margin : 0px; - padding : 0px; + display : inline; + margin: 0px; + padding: 0px; } form.compact input { - color : #ffffff; - font-size : 80%; - font-weight : normal; - padding : 0 6px; + font-size: 80%; + font-weight: normal; + padding: 0 6px; } -h1 - { - color : #000066; - font-size : 20px; - font-weight : bold; - margin-bottom : 3px; - margin-top : 3px; +h1 { + font-size: 20px; + font-weight: bold; + margin-bottom: 3px; + margin-top: 3px; +} + +h1#libraryname a { + text-decoration : none; } h2 { - color : #000066; - font-size : 18px; - font-weight : bold; - margin-bottom : 3px; - margin-top : 3px; + font-size: 18px; + font-weight: bold; + margin-bottom: 3px; + margin-top: 3px; } h3 { - color : #000066; - font-size : 16px; - font-weight : bold; - margin-bottom : 3px; - margin-top : 3px; + font-size: 16px; + font-weight: bold; + margin-bottom: 3px; + margin-top: 3px; } h3.alert { - background-color: #FFCC33; - color: #CC0000; padding: 3px; } h3.title { - background-color: #EEF0DB; - font-size : 18px; - display : block; - padding : 5px; + font-size: 18px; + display: block; + padding: 5px; margin: 0px auto; } h4 { - color : #000066; - font-size : 14px; - font-weight : bold; - margin-bottom : 3px; - margin-top : 3px; + font-size: 14px; + font-weight: bold; + margin-bottom: 3px; + margin-top: 3px; +} + +h4.subtitle { + padding : 0 5px 5px 5px; + margin: 0px; + text-indent: 1em; } h5 { - color : #000066; - font-size : 13px; - font-weight : bold; - margin-bottom : 1px; - margin-top : 1px; + font-size: 13px; + font-weight: bold; + margin-bottom: 1px; + margin-top: 1px; +} + +h5.author { + font-size: 104%; + text-indent: 1em; + padding: 0 5px 5px 5px; + margin: 0; } h6 { - color : #000066; - font-size : 12px; - font-weight : bold; - margin-bottom : 1px; - margin-top : 1px; + font-size: 12px; + font-weight: bold; + margin-bottom: 1px; + margin-top: 1px; } label { - font-weight : bold; - padding : 0px 5px 0px 5px; + font-weight: bold; + padding: 0px 5px 0px 5px; +} + +label.required:after { + content: "*"; + font-family: "Courier New", Courier, monospace; + font-size: 150%; + padding-left: 3px; +} + +p.date-select { + font-size: 80%; + margin-top: 2px; + margin-bottom: 2px; +} + +p.date-select input, p.date-select select { + font-size: 70%; } sup { - font-size : .7em; - color : #cc0000; - font-weight : bold; - font-family : "courier new", courier, monospace; + font-family: "courier new", courier, monospace; + font-size: .7em; + font-weight: bold; } table { - background-color : #CCCCCC; - border-bottom : 0px solid #000000; - border-collapse : collapse; - border-left : 0px solid #000000; - margin : 3px 0px 5px 0px; - padding : 0px; - width : 99%; + border-collapse: collapse; + margin: 3px 0px 5px 0px; + padding: 0px; + width: 99%; } -td { - border-bottom : 1px solid white; - border-right : 1px solid white; - font-size : 12px; - padding : 5px 5px 5px 5px; +table.editing th { + font-size : .8em; + padding : 2px; } -td:last-child { - border-bottom : 1px solid white; - border-right : 0px solid white; - font-size : 12px; - padding : 5px 5px 5px 5px; +table.editing th { + font-size : .8em; + padding : 2px; } -td+ul { - margin-top : 0px; - margin-bottom : 0px; +table.itemtypes { + border-collapse: separate; + border-spacing: 3px; + display: block; + padding: 0; + margin: 0; } -th { - background-color : #D8DEB8; - border-bottom : 1px solid #000000; - border-right : 1px solid #000000; - font-size : 14px; - font-weight : bold; - padding : 5px 5px 5px 5px; +table.marc { + border-collapse: collapse; + margin: 3px 0px 5px 0px; + padding: 0px; + width: auto; } -tr th[scope=row], tr.highlight th[scope=row]{ - font-family : Arial, Geneva, Helvetica, sans-serif; - font-size : 70%; - font-weight : normal; - padding : 0; +table.marc td.label { + font-weight: bold; + width: 25%; } -th:last-child { - background-color : #D8DEB8; - border-bottom : 1px solid #000000; - border-right : 0px solid #000000; - font-size : 14px; - font-weight : bold; - padding : 5px 5px 5px 5px; +table.marc th { + text-align: left; + font-weight: normal; } -td.input, div.form td, div.details td { - border-bottom : 1px solid white; - border-left : 0px; - border-right : 0px; - color : #000000; - line-height : 1.5em; - padding : 4px; - text-align : right; +td { + font-size: 12px; + padding: 5px 5px 5px 5px; } -td.label, div.form th, div.details th { - background-color : #FFC; - border-bottom : 1px solid white; - border-left : 1px solid white; - border-right : 0px; - border-top : 0px; - color : #000088; - font-weight : bold; - line-height : 1.5em; - padding : 4px; - text-align : left; - vertical-align : top; +td fieldset { + margin: 0 0 3px 0; + padding: 0 0 3px 0; } -td.label { - border-bottom : 1px solid white; - border-left : 1px solid white; - color : #000088; - font-weight : bold; - line-height : 1.5em; - padding : 4px; +td form { + margin: 0; } -tr.highlight, td.highlight { - background-color : #FFFFFF; +td input.delete { + font-size: 12px; + font-weight: bold; + padding: 0 5px 0 5px; + margin: 0 5px 0 0; } -td.onissue { - background-color : #EFF1D8; +td input.submit { + margin: 0 5px 0 0; + padding: 0 5px 0 5px; } -tr.highlight td.onissue { - background-color : white; +td legend { + margin: 0; + padding: 4px; } -table.marc { - background-color : #CCCCCC; - border-collapse : collapse; - margin : 3px 0px 5px 0px; - padding : 0px; - width : auto; +td.credit, td.debit, td.sum { + font-family: "Courier New", Courier, monospace; + text-align: right; } -table.marc th { - background-color: white; - border : 0px; - text-align : left; - font-weight : normal; +td.input, div.form td, div.details td { + line-height: 1.5em; + padding: 4px; + text-align: right; } -table.marc td.label { - color : #000000; - font-weight : bold; - width : 25%; +td.label { + font-weight: bold; + line-height: 1.5em; + padding: 4px; } -table.marc td.data { - background-color : #FFFFFF; +td.label, div.form th, div.details th { + font-weight: bold; + line-height: 1.5em; + padding: 4px; + text-align: left; + vertical-align: top; } -/*.barcode { - display : block; - text-align : right; - font-style: italic; - font-size : .95em; - color: #666633; -}*/ +td:last-child { + font-size: 12px; + padding: 5px 5px 5px 5px; +} -.cancel { - background-color : #993300; - color : #CCCCCC; - font-size : 12px; - font-weight : bold; - padding : 2px; +td+ul { + margin-top: 0px; + margin-bottom: 0px; } -td.credit, td.debit, td.sum { - font-family : "Courier New", Courier, monospace; - text-align : right; +tfoot { + font-weight: bold; +} + +th { + font-size: 14px; + font-weight: bold; + padding: 5px 5px 5px 5px; +} + +th:last-child { + font-size: 14px; + font-weight: bold; + padding: 5px 5px 5px 5px; +} + +tr th[scope=row], tr.highlight th[scope=row]{ + font-family: Arial, Geneva, Helvetica, sans-serif; + font-size: 70%; + font-weight: normal; + padding: 0; +} + +.accesskey { + text-decoration: underline; } -td.debit { - color : #990000; +.cancel { + font-size: 12px; + font-weight: bold; + padding: 2px; } .current { - background-color : #FFFFFF; - color : #3366CC; - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -.error { - color : #CC0033; - font-weight : bold; +.error, .overdue { + font-weight: bold; } .ex { - font-family : "Courier New", Courier, monospace; + font-family: "Courier New", Courier, monospace; } .form dd { - border-bottom : 1px solid white; - color : #000000; - display : block; - line-height : 1.5em; - padding : 4px; - text-align : right; + display: block; + line-height: 1.5em; + padding: 4px; + text-align: right; } .form dl { - margin : 0px 0px 0px 0px; - padding : 3px; - width : 80%; + margin: 0px 0px 0px 0px; + padding: 3px; + width: 80%; } .form dt { - border-bottom : 1px solid white; - border-left : 1px solid white; - color : #000088; - float : left; - font-weight : bold; - line-height : 1.5em; - padding : 4px; + float: left; + font-weight: bold; + line-height: 1.5em; + padding: 4px; } .form-help { - font-size : 95%; - padding-left : 15px; + font-size: 95%; + padding-left: 15px; } .inline { - display : inline; + display: inline; } -.menu input { - font-size : 80%; +.issued { + font-style : italic; } -input.focus { - background-color: #FFF; - border-bottom: 2px dashed #993300; +.menu input { + font-size: 80%; } -input.unfocus { - background-color : #FFF; +.nav { + font-size: 12px; + font-weight: bold; + padding: 1px 5px 1px 5px; + text-decoration: none; } -.nav { - font-size : 12px; - font-weight : bold; - padding : 1px 5px 1px 5px; - text-decoration : none; +.no { + float: right; + padding: 0px 15px 0px 15px; + width: 33%; + margin: 0px 2px 0px 2px; + text-align: center; } .print { font-size: 10px; } -//Controls the attributes of form submit buttons -.submit { - background-color : #CCCCCC; - color : #EEF0DB; - font-size : 12px; - font-weight : bold; - padding : 2px; +.item-datedue { + display: block; + font-style: italic; } -td form { - margin : 0; +.item-details { + display: block; + margin: 0 0 0 25px; } -td input.submit { - border : 1px outset #CCCC99; - color : #CCCCCC; - margin : 0 5px 0 0; - padding : 0 5px 0 5px; +.item-onorder { + display : block; + font-style : italic; } -td input.submit:active { - border : 1px inset #cccc99; +.item-reserved, .item-notforloan, .item-lost, .item-cancelled, .item-damaged, .item-reserved { + display: block; } -td input.delete { - border : 1px outset #CCCC99; - color : #CCCCCC; - background-color : #993300; - font-size : 12px; - font-weight : bold; - padding : 0 5px 0 5px; - margin : 0 5px 0 0; +.searchresults p { + font-size: 1.2em; + font-weight: bold; + margin: .2em; +} + +.searchresults p+p { + font-size: 1em; + font-weight: normal; + text-indent: 1em; +} + +.searchresults strong a { + font-weight: bold; + font-size: 14px; +} + +.searchresults th { + font-size : .8em; +} + +.searchresults td, .searchresults th { + padding: 2px 2px 2px 5px; } -td input.delete:active { - border : 1px inset #cccc99; +.submit, div.details dt, .cancel { + font-size: 12px; + font-weight: bold; + padding: 2px; } .thumbnail { - float : left; - margin : 0 5px 10px 0; - border : 0px solid white; + float: left; + margin: 0 5px 10px 0; } .yes { float: left; - padding : 0px 15px 0px 15px; - width : 33%; - margin : 0px 2px 0px 2px; + padding: 0px 15px 0px 15px; + width: 33%; + margin: 0px 2px 0px 2px; text-align: center; } -.no { - float: right; - padding : 0px 15px 0px 15px; - width : 33%; - margin : 0px 2px 0px 2px; - text-align: center; +#auth { + margin: 0 30% 0 30%; + padding: 5px; } -#auth { - background-color : transparent; - margin : 0 30% 0 30%; - padding : 5px; +#auth p { + width: 25%; + margin: 0 auto; + text-align: center; + padding: 0; } #auth table { - border-collapse : separate; + border-collapse: separate; } #auth table td { - background-color : white; - border-bottom : 1px solid #999933; - border-left : 1px solid #FFFFFF; - border-right : 1px solid #999933; - border-top : 1px solid #FFFFFF; - text-align : left; + text-align: left; } #auth table th{ - background-color : white; - border-bottom : 1px solid #999933; - border-left : 1px solid #FFFFFF; - border-right : 1px solid #999933; - border-top : 1px solid #FFFFFF; - width : 50%; - text-align : right; -} - -#auth p { - width : 25%; - margin : 0 auto; - text-align : center; - padding : 0; + text-align: right; + width: 25%; } #main { - background-color : #CCCCCC; - padding : 10px; -} - -#mainMarcEdit { - position:absolute; - background-color : #CCCCCC; - top:150; - left:125; + margin-left: 18%; + margin-right: 2%; + margin-top: 2%; + padding: 10px; } #main-compact { - background-color : #CCCCCC; - border-left : 1px solid #CCCCCC; - margin-left : 2%; - margin-right : 2%; - margin-top : 2%; - padding : 10px; + margin-left: 2%; + margin-right: 2%; + margin-top: 2%; + padding: 10px; } -#menu { - background-color : #FFFFFF; +#menu dd { + padding: 3px 45px 3px 10px; } -#menu dd { - border-bottom : 1px dashed #D8DEB8; - border-left : 1px dashed #D8DEB8; - border-right : 0px solid #000000; - border-top : 0px solid #000000; - padding : 3px 45px 3px 10px; +#menu dd form { + margin : 4px 0; } #menu dd a { - font-size : 1.05em; - font-weight : bold; - text-decoration : none; + font-size: 1.05em; + font-weight: bold; + text-decoration: none; } -#menu dd li { - display : inline; - white-space : nowrap; +#menu dd ul { + margin : 3px 0; } -#menu dd li:before { - content : "\00BB \0020"; +#menu dd li { + display: inline; + white-space: nowrap; } -#menu dd ul { - display : inline; - list-style : disc; +#menu dd li a { + padding : 2px 7px 2px 0; + margin : 10px 5px; } #menu dl { - margin : 0px; - padding : 0px; /*width : 80%;*/ + margin: 0px; + padding: 0px; } #menu dt { - background-color : #FFFFFF; - border-bottom : 1px solid #D8DEB8; - border-left : 0px solid #D8DEB8; - border-right : 0px solid #000000; - border-top : 0px solid #000000; - color : #000066; - font-size : 1.2em; - font-weight : bold; - padding : 2px 2px 2px 5px; + font-size: 1.2em; + font-weight: bold; + padding: 2px 2px 2px 5px; } #menu dt a { - text-decoration : none; + text-decoration: none; } #nav { - background-color : #CCCC99; - position : absolute; - left : 1px; - margin : 2% 0% 0% 1%; - padding : 0px; - width : 17%; + position: absolute; + left: 1px; + margin: 2% 0% 0% 5px; + padding: 0px; + width: 16%; } #nav .submit { - font-size : 9px; + font-size: 9px; } #nav a { - font-family : Tahoma, arial, geneva, sans-serif; - font-weight : bold; - text-decoration : none; + font-family: Tahoma, arial, geneva, sans-serif; + font-weight: bold; + text-decoration: none; } #nav h4 { - font-size : 12px; - font-weight : bold; - margin : 0px; - padding : 0px; - text-align : left; + font-size: 12px; + font-weight: bold; + margin: 0px; + padding: 0px; + text-align: left; } #nav input { - font-size : .8em; + font-size: .8em; } #nav label { - font-size : 10px; + font-size: 10px; } #nav ul { - margin : 0px; - padding : 0px; + margin: 0px; + padding: 0px; } #nav ul li { - background-color : #D8DEB8; - border-bottom : 1px solid #CCCCCC; - border-left : 0px solid #CCCCCC; - border-right : 0px solid #006699; - border-top : 0px solid #CCCCCC; - font-size : .8em; - list-style : none; - padding : 3px; - text-align : right; - width : 100%; -} - -#nav ul li+li { - border-bottom : 1px solid #CCCCCC; - border-left : 0px solid #CCCCCC; - border-right : 0px solid #006699; + font-size: .8em; + list-style: none; + padding: 3px 3px 10px 3px; + text-align: right; + width: 100%; } #nav ul ul { - margin : 0px 0px 0px 5px; + margin: 0px 0px 0px 5px; } #nav ul ul li { - background-color : #EFF1D8; - border-bottom : 1px solid #CCCC99; - border-left : 0px solid #CCCCCC; - border-right : 0px solid #006699; - border-top : 0px solid #CCCCCC; - font-size : .9em; - list-style : none; - margin : 0px 0px 0px 0px; - padding : 0px 0px 0px 0px; - text-align : right; - width : 100%; + font-size: .9em; + list-style: none; + margin: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; + text-align: right; + width: 100%; +} + +#nav ul ul { + margin : 0 2px 0 0; } #nav ul ul li+li { - border-bottom : 1px solid #CCCC99; - border-left : 0px solid #CCCCCC; - border-right : 0px solid #006699; - padding : 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; +} + +#nav ul#facets li { + font-weight: bold; + text-align: left; +} + +#nav ul#facets ul li { + font-weight : normal; + margin : 0; + text-align: left; + padding : 2px; +} + +#nav ul#facets ul li a { + font-size : .95em; + font-weight : normal; +} + +#nav ul#facets + +#nav ul#facets ul li.showmore { + text-align: center; +} + +#nav ul#facets ul li.showmore a { + font-weight: bold; + text-decoration: none; } #notes { - float : right; - margin : 0px; - font-size : 12px; + float: right; + font-size: 12px; + margin: 0px; +} + +#notes img { + float: left; + margin: 3px; + padding : 2px; } #notes ul { - margin : 0px; - padding : 0px; + margin-left: 95px; } #results, .results { - color : #000066; - font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size : .8em; - margin : 0px; - padding : 3px 0px 15px 0px; + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: .8em; + margin: 0px; + padding: 3px 0px 15px 0px; +} + +#submenu dd { + margin-left: 2%; } -#submenu { - background-color: #CCCCCC; +#submenu dd ul { + margin-left: 0; + padding-left: 7%; } #submenu dl { - background-color : white; float: left; - font-size : 90%; + font-size: 90%; margin: 10px 10px; padding: 2px 2px 2px 7px; - width : 27%; + width: 27%; } #submenu dt { font-size: 100%; - font-weight : bold; -} - -#submenu dd { - margin-left: 2%; -} - -#submenu dd ul { - margin-left : 0; - padding-left : 7%; + font-weight: bold; } #topmenu { - color : #CCCC99; - margin-bottom : 5px; - margin-left : 20px; - margin-right : 10px; + margin-bottom: 5px; + margin-left: 20px; + margin-right: 10px; } #topmenu .submit { - background-color : #999933; - color : #CCCCCC; - font-size : .7em; - padding : 2px; + font-size: .7em; + padding: 2px; } #topmenu a:link { - color : #CCFF66; - font-weight : bold; - padding : 2px; + font-weight: bold; + padding: 2px; } #topmenu a:visited { - color : #CCFF66; - font-weight : bold; - padding : 2px; + font-weight: bold; + padding: 2px; } #topmenu a:hover { - color : #CCCCCC; - font-weight : bold; - padding : 2px; + font-weight: bold; + padding: 2px; } #topmenu a:active { - color : #CCCCCC; - font-weight : bold; - padding : 2px; + font-weight: bold; + padding: 2px; } #topmenu form { - display : inline; + display: inline; } #topmenu label { - font-weight : bold; -} - -.searchresults td { - padding : 2px 2px 2px 5px; + font-weight: bold; } -.searchresults p { - font-size : 1.2em; - font-weight : bold; - margin : .2em; -} +/* MARC EDITOR */ -.searchresults p+p { - font-size : 1em; - font-weight : normal; - text-indent : 1em; +div.tabbed { + margin-left:5%; + width:90%; } -.searchresults strong a { - font-weight : bold; - font-size : 14px; +div.tabs { + float : left; + margin : 5px 0 0 0; } -div.members th { - background-color : #CCCCCC; - border-bottom : 1px solid white; - border-right : 1px solid white; - font-size : 12px; - padding : 3px 5px; - width : 25%; +div.tabs a { + display:block; font-weight : bold; - text-align : left; - vertical-align : top; -} - -div.members th label { - display : block; - margin : 0; - padding : 0; + text-decoration : none; + margin : 0 0 2px 0; + padding: 10px 5px 10px 5px; } -div.members label.focus { - color : #cc0000; +div.tabs a:hover { } -div.members th p, div.compact th p { - font-weight : normal; - padding : 0; - margin : 0; - text-indent : 1em; +div.tab { + display: block; + visibility:hidden; + position : absolute; + margin : 5px 0 0 20px; + padding : 3px; + width : 70%; + /*margin-top:110px;*/ } -td fieldset { - border : 1px solid #CCCCCC; - margin : 0 0 3px 0; - padding : 0 0 3px 0; +div.tab p { + margin : 3px; } -fieldset label { - float : left; - margin-left : 3px; - width : 25%; +div.displaytab { + display: block; + float:left; + font-size: .8em; + width : 100%; } -td legend { +div.displaytab p { margin : 0; - padding : 4px; -} - -table.editing tr:hover td { - background-color: #EFF1D8; + padding : 3px 0; } -tfoot { - background-color : white; +.MARCtag { /* style for tag definition (700 - Statement of responsability) */ + clear : left; font-weight : bold; + font-size : .8em; + margin-top : 5px; } -tfoot td, tfoot td:last-child { - border-right : 1px solid #999900; - border-bottom : 1px solid #999900; -} - -div.data table, div.data-main table { - background-color: #D8DeB8; - border-collapse: collapse; - margin : auto; - margin : 0 0 5px 0; -} - -div.data table caption { +div.displaytab .MARCtag { font-size : 1em; } -div.data-main table caption { - font-size : 1.1em; -} - -div.data table td, div.data-main table td { - border-right : 1px solid #CCCC99; - border-bottom : 1px solid #CCCC99; - background-color: #CCCCCC; - font-size: 12px; - padding : 2px; - padding-left : .7em; - margin : 0 0 0 0; -} - -div.data-main table td { - background-color : #FFFFE1; -} - -div.data table th, div.data-main table th { - border-left : 1px solid #999933; - border-right : 1px solid #CCCC99; - border-bottom : 1px solid #CCCC99; - font-size : 12px; - font-weight: bold; - text-align : right; - padding : 2px; - padding-right : 1em; - background-color: white; - width : 17%; -} - -div.data-main table th { - background-color : #EFF1D8; -} - -div.data table tr.highlight td { - background-color: #FFFFE1; +.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */ + clear : left; + float : left; + font-size : .8em; + font-weight : normal; + width : 12em; + margin-left : 30px; + display : inline; } -div.data table tr.highlight th { - font-size: 70%; +div.displaytab .labelsubfield { + font-size : 1em; font-weight: bold; - background-color : #EEF0DB; - padding-right : 1em; } -div.data table th[scope=col], div.data-main table th[scope=col] { - text-align: center; - border-left : 0; -} +#loading { + position: absolute; + top: 3em; + left: 3em; + padding: 1em; + font-size: 1.5em; + z-index: 999; + } -div.data table col, div.data-main table col { - background-color : #CCCCCC; +input.mandatory { + width : 55%; } -.accesskey { - text-decoration : underline; +div.tabs a.addbiblioTabOn { } -div#controls { - float: right; - margin-left : .7em; - width : 15%; +div.tabs a.addbiblioTabOff { } -div#controls form { - background-color : #CCCCCC; - font-size : 80%; - margin : .3em 0; - padding : .3em; +input.addbiblioInput { + width : 55%; } -label.required:after { - content: "*"; - font-family : "courier new", courier, monospace; - font-size : 150%; - color : #cc0000; - padding-left : 3px; +input.addbiblioInputFocus { + width : 55%; } -p.date-select {; - font-size : 80%; - margin : 2px 0; +input.indicator { } -p.date-select input, p.date-select select { - font-size : 70%; - background-color : #EFF1D8; +input.indicatorFocus { } \ No newline at end of file From btoumi at ouestprovence.fr Thu Jan 4 10:20:09 2007 From: btoumi at ouestprovence.fr (Bruno Toumi) Date: Thu, 04 Jan 2007 09:20:09 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/circ circu... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Bruno Toumi 07/01/04 09:20:09 Modified files: koha-tmpl/intranet-tmpl/prog/en/circ: circulation.tmpl Log message: bug fix with wrong condition in issue year field remove 2006 year for manual issue happy new year ;=) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.18&r2=1.6.2.19 Patches: Index: circulation.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v retrieving revision 1.6.2.18 retrieving revision 1.6.2.19 diff -u -b -r1.6.2.18 -r1.6.2.19 --- circulation.tmpl 14 Dec 2006 10:42:25 -0000 1.6.2.18 +++ circulation.tmpl 4 Jan 2007 09:20:09 -0000 1.6.2.19 @@ -555,17 +555,12 @@ From paul at koha-fr.org Thu Jan 4 14:10:40 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:10:40 +0000 Subject: [Koha-cvs] koha/C4/Circulation Circ2.pm [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:10:40 Modified files: C4/Circulation : Circ2.pm Log message: the field name is dateexpiry & not expiry CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.26&r2=1.114.2.27 Patches: Index: Circ2.pm =================================================================== RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.114.2.26 retrieving revision 1.114.2.27 diff -u -b -r1.114.2.26 -r1.114.2.27 --- Circ2.pm 14 Dec 2006 15:41:53 -0000 1.114.2.26 +++ Circ2.pm 4 Jan 2007 13:10:39 -0000 1.114.2.27 @@ -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: Circ2.pm,v 1.114.2.26 2006/12/14 15:41:53 toins Exp $ +# $Id: Circ2.pm,v 1.114.2.27 2007/01/04 13:10:39 tipaul Exp $ use strict; require Exporter; @@ -40,7 +40,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); # set the version for version checking -$VERSION = do { my @v = '$Revision: 1.114.2.26 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; +$VERSION = do { my @v = '$Revision: 1.114.2.27 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; =head1 NAME @@ -1328,9 +1328,9 @@ # if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate if ( C4::Context->preference('ReturnBeforeExpiry') - && $dateduef gt $borrower->{expiry} ) + && $dateduef gt $borrower->{dateexpiry} ) { - $dateduef = $borrower->{expiry}; + $dateduef = $borrower->{dateexpiry}; } $sth->execute( $borrower->{'borrowernumber'}, From paul at koha-fr.org Thu Jan 4 14:11:08 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:11:08 +0000 Subject: [Koha-cvs] koha/C4 AuthoritiesMarc.pm [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:11:08 Modified files: C4 : AuthoritiesMarc.pm Log message: commenting 2 zconn destroy CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.9&r2=1.28.2.10 Patches: Index: AuthoritiesMarc.pm =================================================================== RCS file: /sources/koha/koha/C4/AuthoritiesMarc.pm,v retrieving revision 1.28.2.9 retrieving revision 1.28.2.10 diff -u -b -r1.28.2.9 -r1.28.2.10 --- AuthoritiesMarc.pm 22 Dec 2006 15:09:53 -0000 1.28.2.9 +++ AuthoritiesMarc.pm 4 Jan 2007 13:11:08 -0000 1.28.2.10 @@ -239,8 +239,8 @@ }## if nbresult NOLUCK: -$oAResult->destroy(); -$oAuth[0]->destroy(); +# $oAResult->destroy(); +# $oAuth[0]->destroy(); return (\@finalresult, $nbresults); } @@ -879,8 +879,11 @@ =cut -# $Id: AuthoritiesMarc.pm,v 1.28.2.9 2006/12/22 15:09:53 toins Exp $ +# $Id: AuthoritiesMarc.pm,v 1.28.2.10 2007/01/04 13:11:08 tipaul Exp $ # $Log: AuthoritiesMarc.pm,v $ +# Revision 1.28.2.10 2007/01/04 13:11:08 tipaul +# commenting 2 zconn destroy +# # Revision 1.28.2.9 2006/12/22 15:09:53 toins # removing C4::Database; # From paul at koha-fr.org Thu Jan 4 14:11:34 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:11:34 +0000 Subject: [Koha-cvs] koha/C4 Search.pm [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:11:34 Modified files: C4 : Search.pm Log message: adding location to result list CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.38&r2=1.120.2.39 Patches: Index: Search.pm =================================================================== RCS file: /sources/koha/koha/C4/Search.pm,v retrieving revision 1.120.2.38 retrieving revision 1.120.2.39 diff -u -b -r1.120.2.38 -r1.120.2.39 --- Search.pm 21 Dec 2006 15:35:17 -0000 1.120.2.38 +++ Search.pm 4 Jan 2007 13:11:34 -0000 1.120.2.39 @@ -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.38 $' =~ /\d+/g; +$VERSION = do { my @v = '$Revision: 1.120.2.39 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); }; @@ -951,6 +951,8 @@ } $items->{ $item->{homebranch} }->{itemcallnumber} = $item->{itemcallnumber}; + $items->{ $item->{homebranch} }->{location} = + $item->{location}; } } # notforloan, item level and biblioitem level for my $key ( keys %$items ) { From paul at koha-fr.org Thu Jan 4 14:11:50 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:11:50 +0000 Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en/includes opac.css [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:11:50 Modified files: koha-tmpl/opac-tmpl/prog/en/includes: opac.css Log message: improving opac.css (synched with SANOP one) CVSWeb URLs: 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.3&r2=1.1.2.4 Patches: Index: opac.css =================================================================== RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -b -r1.1.2.3 -r1.1.2.4 --- opac.css 22 Dec 2006 17:12:12 -0000 1.1.2.3 +++ opac.css 4 Jan 2007 13:11:50 -0000 1.1.2.4 @@ -1,217 +1,308 @@ +/* color scheme : +- #384b73 : light blue, for menus, text enhancement, footer & header +- #eeeeee : light grey, for background color +- #CCCCCC : for table backgrounds +- #EEC95A : orange for action buttons & hyperlinks +*/ + body { - font-family : Verdana, Geneva, Arial, sans-serif; - font-size : 1em; +font-family : Verdana, Geneva, Arial, sans-serif; +font-size : 1em; +background-color : #eeeeee; +text-align: left; +margin-bottom:0px; } p { - margin:0px 0px 0px 0px; +margin:0px; +padding:0px; +} + +a:link, a:visited, a:active { +text-decoration : none; +color :#384b73; +} + +a:hover { +text-decoration : none; +background-color : #EEC95A; +/* color:white; */ +} + +fieldset { +display:inline; +border: 1px solid #384b73; +} + +#masthead { +color:#384b73; } table { - border-collapse : collapse; - border-top : 1px solid #CCCCCC; - border-right : 1px solid #CCCCCC; - margin : 1em 0; +border-collapse : collapse; +border : 1px solid #CCCCCC; +/*border-right : 1px solid #CCCCCC;*/ +margin : 1em 0; } caption { - font-size : 140%; - text-align : left; - font-weight : bold; +font-size : 140%; +text-align : left; +font-weight : bold; } td,th { - border-left : 1px solid #CCCCCC; - border-bottom : 1px solid #CCCCCC; - padding : 5px; +border : 1px solid #CCCCCC; +border-bottom : 1px solid #CCCCCC; +padding : 5px; } th { - background-color : #CCCCCC; - border-left : 1px solid #999999; - border-bottom : 1px solid #999999; +background-color: #384b73; +color:white; +border : 1px solid #CCCCCC; +border-right: 1px solid #CCCCCC; } th[scope=row] { - background-color : #EEEEEE; - text-align : right; +text-align : right; } input[type=submit], input[type=button], input[type=reset] { - background-color : #6699cc; - color : #FFFFFF; - font-size : 1em; - font-weight : bold; +background-color : #EEC95A; +color : #FFFFFF; +font-size : 1em; +font-weight : bold; +} + +.searchresults td, .searchresults th, .searchresults table { +border: 0; +} + +.searchresults tr { +border-bottom : 1px solid #CCCCCC; +} + +.searchresults table { +border-top : 0px solid #CCCCCC; +border: 1px solid #CCCCCC; } +p.searchresults { +background-color : #EFF1DC; +} + +.searchresults a.reserve { +background-color : transparent; +color : #006699; +} + + .searchresults table tr:hover { - background-color: #CCFFFF; +background-color: #CCFFFF; } -tr.highlight td, tr.highlight th { - background-color : #EEEEEE; +#advsearch-itemtype table { +border-collapse: separate; +border-spacing: 3px; +} +#advsearch-itemtype table tr td { +background-color:#CCCCCC; +width:100%; } +#advsearch-itemtype table tr td p { +font-size:0.8em; +} +tr.highlight td, tr.highlight th { +background-color : #EEEEEE; +border: 1px solid #DDDDDD; +border-right: 1px solid #DDDDDD;} /* style for search terms in catalogsearch */ .term { - background-color:yellow; +background-color:yellow; } .here { - color: black; - text-decoration:none; +color: black; +text-decoration:none; } #main { - margin-left:15%; +margin-left:15%; +margin-bottom:0px; } #menu { - float:left; - border-right:1px solid black; - padding:10px; - margin:5px; - font-size:0.8em; +float:left; +border-right:1px solid black; +padding:0px; +margin:5px; +font-size:0.8em; +color:#384b73; } #menu ul a { - display:block; - margin-bottom:5px; - padding-left :5px; - text-decoration:none; - font-weight:normal; - color:black; +display:block; +margin:5px 5px 0px 5px; +padding :5px 5px 0px 5px; +text-decoration:none; +/* font-weight:bold;*/ +color:#384b73; } #menu ul a:hover { - display:block; - margin-bottom:5px; - padding-left :5px; - text-decoration:none; - font-weight:normal; - background-color:#6699cc; - color:white; +display:block; +margin:5px 5px 0px 5px; +padding :5px 5px 0px 5px; +text-decoration:none; +/* font-weight:bold;*/ +background-color:#384b73; +color:white; } #menu ul { - list-style-type: none; - padding-left:0px; - margin-bottom:0px; - margin-top:0px; +list-style-type: none; +padding-left:0px; +margin-bottom:0px; +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; +background-color : #EEC95A; +color : #FFFFFF; +font-size : 1em; +border: 2px outset; +font-weight : bold; +margin:0px 5px 0px 0px; +padding:2px 5px 2px 5px; +/*padding-left:5px;*/ + +text-decoration:none; +display: inline; } #usermenu a:hover { - border: 2px inset; - background-color:#CCCCCC; +border: 2px inset; +background-color:#384b73; } #problem { - color: red; - background-color:white; - font-weight : bold; +color: red; +background-color:white; +font-weight : bold; } #admin_stopwords_select UL { - width: 600px; +width: 600px; } #admin_stopwords_select UL LI { - white-space: nowrap; +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; +background-color : #EEC95A; +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; +border: 2px inset; +background-color:#CCCCCC; +} + +#auth { +float:left; } /* facets bloc */ #facets { - float:right; - margin-top: 15px; - margin-left: 15px; - border:1px solid #CCCCCC; +float:right; +border: 1px solid #CCCCCC; +margin-top: 5px; +margin-left: 15px; +font-size:0.8em; } #facets h2 { - background-color:#CCCCCC; - margin:0px; - padding:0px; - font-size:1.1em; +background-color:#EFF1DC; +border-bottom: 1px solid #CCCCCC; +/* padding: 5px 5px 10px 5px;*/ +margin:0px; +font-size:1em; +} + +#facets ul { +list-style-type: none; +padding-left:10px; +margin-bottom:0px; +margin-top:0px; } /* the USER information block */ #librarian_information { /* position:absolute; */ - float:right; - font-size:10pt; +float:right; +font-size:10pt; } -.legend { - font-size:120%; - font-weight:bold; +legend { +font-weight:bold; +color:#384b73; } .problem { - color: white; - background-color:red; +color: white; +background-color:red; } /* css styles for reserves color alerts */ .onloan { - background-color: #FFED3D; +background-color: #FFED3D; } .reserved { - background-color: #8EBAFF; +background-color: #8EBAFF; } .transfered { - background-color: #F9FF9A; +background-color: #F9FF9A; } .inwait { - background-color: #33CC99; +background-color: #33CC99; } .other { - background-color: #FF0000; +background-color: #FF0000; } .available { - background-color: white; +background-color: white; } .unavailable { - background-color: #FFED3D; +background-color: #FFED3D; } /* style for search terms in catalogsearch */ .term { - background-color:yellow; +background-color:green; +} + +/* the footer */ +#footer h2 { +/* margin-left:15%; */ + border-top:1px solid #384b73; + color: #384b73; + font-size:1em; + text-align:center; } From paul at koha-fr.org Thu Jan 4 14:12:19 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:12:19 +0000 Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-advsearch... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:12:19 Modified files: koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl Log message: some modifs in itemtype selector CVSWeb URLs: 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.9&r2=1.1.2.10 Patches: Index: opac-advsearch.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -b -r1.1.2.9 -r1.1.2.10 --- opac-advsearch.tmpl 3 Jan 2007 08:38:54 -0000 1.1.2.9 +++ opac-advsearch.tmpl 4 Jan 2007 13:12:19 -0000 1.1.2.10 @@ -95,18 +95,18 @@ - -

+ +

Itemtype to: match any of the following -

Home Branch:

- " name="limit" value="mt:"/>

" alt="" title=""/> -

+ -

- - +

" name="limit" value="mt:"/>" />

+ +

From paul at koha-fr.org Thu Jan 4 14:12:54 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:12:54 +0000 Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-user.tmpl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:12:54 Modified files: koha-tmpl/opac-tmpl/prog/en: opac-user.tmpl Log message: some minor html changes CVSWeb URLs: 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.6&r2=1.1.2.7 Patches: Index: opac-user.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -b -r1.1.2.6 -r1.1.2.7 --- opac-user.tmpl 8 Dec 2006 16:33:51 -0000 1.1.2.6 +++ opac-user.tmpl 4 Jan 2007 13:12:54 -0000 1.1.2.7 @@ -11,11 +11,10 @@
-

+

Welcome

(Click here if you're not ) -

Message from the library

From paul at koha-fr.org Thu Jan 4 14:12:35 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 13:12:35 +0000 Subject: [Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en opac-results.tmpl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 13:12:35 Modified files: koha-tmpl/opac-tmpl/prog/en: opac-results.tmpl Log message: adding location to result list CVSWeb URLs: 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.10&r2=1.1.2.11 Patches: Index: opac-results.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-results.tmpl,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -b -r1.1.2.10 -r1.1.2.11 --- opac-results.tmpl 22 Dec 2006 17:38:31 -0000 1.1.2.10 +++ opac-results.tmpl 4 Jan 2007 13:12:35 -0000 1.1.2.11 @@ -235,6 +235,7 @@ () + () ("> From btoumi at ouestprovence.fr Thu Jan 4 14:57:47 2007 From: btoumi at ouestprovence.fr (Bruno Toumi) Date: Thu, 04 Jan 2007 13:57:47 +0000 Subject: [Koha-cvs] koha/C4 Branch.pm [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Bruno Toumi 07/01/04 13:57:47 Modified files: C4 : Branch.pm Log message: bug fix: add DelBranch function declaration in Branch module CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/C4/Branch.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2 Patches: Index: Branch.pm =================================================================== RCS file: /sources/koha/koha/C4/Attic/Branch.pm,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -b -r1.1.2.1 -r1.1.2.2 --- Branch.pm 14 Dec 2006 15:41:53 -0000 1.1.2.1 +++ Branch.pm 4 Jan 2007 13:57:46 -0000 1.1.2.2 @@ -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: Branch.pm,v 1.1.2.1 2006/12/14 15:41:53 toins Exp $ +# $Id: Branch.pm,v 1.1.2.2 2007/01/04 13:57:46 btoumi Exp $ use strict; require Exporter; @@ -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.1.2.1 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; +$VERSION = do { my @v = '$Revision: 1.1.2.2 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; =head1 NAME @@ -55,6 +55,7 @@ &CheckBranchCategorycode &GetBranchInfo &ModBranchCategoryInfo + &DelBranch ); =head2 GetBranches From paul at koha-fr.org Thu Jan 4 15:49:16 2007 From: paul at koha-fr.org (paul poulain) Date: Thu, 04 Jan 2007 14:49:16 +0000 Subject: [Koha-cvs] koha cataloguing/addbooks.pl koha-tmpl/intranet... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: paul poulain 07/01/04 14:49:16 Modified files: cataloguing : addbooks.pl koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbiblio.tmpl addbooks.tmpl Log message: reintroducing reservoir management in cataloguing CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.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/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5 Patches: Index: cataloguing/addbooks.pl =================================================================== RCS file: /sources/koha/koha/cataloguing/addbooks.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 --- cataloguing/addbooks.pl 18 Dec 2006 16:35:18 -0000 1.2.2.3 +++ cataloguing/addbooks.pl 4 Jan 2007 14:49:16 -0000 1.2.2.4 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $Id: addbooks.pl,v 1.2.2.3 2006/12/18 16:35:18 toins Exp $ +# $Id: addbooks.pl,v 1.2.2.4 2007/01/04 14:49:16 tipaul Exp $ # # Modified saas at users.sf.net 12:00 01 April 2001 @@ -36,6 +36,7 @@ use CGI; use C4::Auth; use C4::Biblio; +use C4::Breeding; use C4::Output; use C4::Interface::CGI::Output; @@ -46,6 +47,7 @@ my $success = $input->param('biblioitem'); my $query = $input->param('q'); +my @value = $input->param('value'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -70,7 +72,7 @@ # Searching the catalog. if($query) { - my ($error, $marcresults) = SimpleSearch($query); + my ($error, $marcresults);# = SimpleSearch($query); if (defined $error) { $template->param(error => $error); @@ -79,7 +81,7 @@ exit; } - my $total = scalar @$marcresults; + my $total;# = scalar @$marcresults; my @results; for(my $i=0;$i<$total;$i++) { @@ -113,9 +115,33 @@ ); } -my $marc_p = C4::Context->boolean_preference("marc"); -$template->param( NOTMARC => !$marc_p, - frameworkcodeloop => \@frameworkcodeloop, +# fill with books in breeding farm +my $toggle=0; +my ($title,$isbn); +# fill isbn or title, depending on what has been entered +$isbn=$query if $query =~ /\d/; +$title=$query unless $isbn; +my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query; +my @breeding_loop = (); +for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) { + my %row_data; + if ( $i % 2 ) { + $toggle = 0; + } + else { + $toggle = 1; + } + $row_data{toggle} = $toggle; + $row_data{id} = $resultsbr[$i]->{'id'}; + $row_data{isbn} = $resultsbr[$i]->{'isbn'}; + $row_data{file} = $resultsbr[$i]->{'file'}; + $row_data{title} = $resultsbr[$i]->{'title'}; + $row_data{author} = $resultsbr[$i]->{'author'}; + push ( @breeding_loop, \%row_data ); +} + +$template->param( frameworkcodeloop => \@frameworkcodeloop, + breeding_loop => \@breeding_loop, ); output_html_with_http_headers $input, $cookie, $template->output; Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -b -r1.1.2.14 -r1.1.2.15 --- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl 27 Nov 2006 17:25:44 -0000 1.1.2.14 +++ koh

Quantity Received: *	" /> +	Total Items Received: (including previous parcels)	1" /> + 0" />
Replacement Cost:

Budgets	From	- + ">	Index: recieve.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieve.tmpl,v retrieving revision 1.1.2.3.2.2 retrieving revision 1.1.2.3.2.3 diff -u -b -r1.1.2.3.2.2 -r1.1.2.3.2.3 --- recieve.tmpl 12 Dec 2006 17:19:31 -0000 1.1.2.3.2.2 +++ recieve.tmpl 1 Jan 2007 00:41:07 -0000 1.1.2.3.2.3 @@ -1,6 +1,6 @@ Koha -- Receipt Summary for : , Invoice - + Receipt parcel for @@ -85,18 +85,11 @@ lines
		&biblio=&invoice=&gst=&freight=&supplierid=&datereceived=&catview=yes"">						&biblio=&invoice=&gst=&freight=&supplierid=&datereceived=&catview=yes" class="button acquisition">Recieve

Accounting details

Receipt parcel for

Still servers to search

Add by to a Virtual Shelf

+

Welcome

Message from the library