[Koha-cvs] koha C4/Biblio.pm C4/Circulation.pm C4/Context....
paul poulain
paul at koha-fr.org
Tue May 22 11:14:01 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/05/22 09:14:00
Modified files:
C4 : Biblio.pm Circulation.pm Context.pm Stats.pm
circ : pendingreserves.pl transferstodo.pl
transferstoreceive.pl
koha-tmpl/intranet-tmpl/prog/en: auth.tmpl
koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl
neworderempty.tmpl
koha-tmpl/intranet-tmpl/prog/en/admin: biblio_framework.tmpl
categoryitem.tmpl
itemtypes.tmpl
systempreferences.tmpl
koha-tmpl/intranet-tmpl/prog/en/authorities:
searchresultlist-auth.tmpl
koha-tmpl/intranet-tmpl/prog/en/barcodes:
label-edit-template.tmpl
label-home.tmpl
koha-tmpl/intranet-tmpl/prog/en/catalogue: detail.tmpl
results.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: branchtransfers.tmpl
circulation.tmpl
returns.tmpl
transferstodo.tmpl
transferstoreceive.tmpl
waitingreserves.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: doc-head-close.inc
intranet.css
menu-catalogue.inc
menus.inc
koha-tmpl/intranet-tmpl/prog/en/installer: step1.tmpl
koha-tmpl/intranet-tmpl/prog/en/members: member.tmpl
memberentryI.tmpl
readingrec.tmpl
koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials: claims.tmpl
serials-edit.tmpl
subscription-add.tmpl
subscription-detail.tmpl
koha-tmpl/opac-tmpl/prog/en: opac-main.tmpl opac-results.tmpl
koha-tmpl/opac-tmpl/prog/en/includes: doc-head-close.inc
opac.css
misc/cronjobs : zebraqueue_start.pl
misc/migration_tools: rebuild_zebra.pl
misc/migration_tools/22_to_30: rebuild_unimarc_100.pl
misc/translator/po: prog_opac_fr.po
misc/zebra : record_authorities_unimarc.abs
opac : changelanguage.pl opac-main.pl
serials : member-search.pl
Added files:
koha-tmpl/intranet-tmpl/prog/en/includes: intranet2.css
koha-tmpl/intranet-tmpl/prog/images: bg-tab.png css_header.png
koha-logo.png
Log message:
Bugfixes & improvements (various and minor) :
- updating templates to have tmpl_process3.pl running without any errors
- adding a drupal-like css for prog templates (with 3 small images)
- fixing some bugs in circulation & other scripts
- updating french translation
- fixing some typos in templates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Stats.pm?cvsroot=koha&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/koha/circ/pendingreserves.pl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstodo.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstoreceive.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/images/bg-tab.png?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/images/css_header.png?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/images/koha-logo.png?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/cronjobs/zebraqueue_start.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/rebuild_zebra.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/22_to_30/rebuild_unimarc_100.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/misc/translator/po/prog_opac_fr.po?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/record_authorities_unimarc.abs?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/changelanguage.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/koha/serials/member-search.pl?cvsroot=koha&r1=1.6&r2=1.7
Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- C4/Biblio.pm 22 May 2007 08:51:19 -0000 1.207
+++ C4/Biblio.pm 22 May 2007 09:13:54 -0000 1.208
@@ -33,7 +33,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.207 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.208 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
@ISA = qw( Exporter );
@@ -437,7 +437,7 @@
#new entry in branchtransfers....
my $sth = $dbh->prepare(
"INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
- VALUES (?, ?, now(), $?)");
+ VALUES (?, ?, now(), ?)");
$sth->execute($itemnumber, $frombranch, $tobranch);
#update holdingbranch in items .....
$sth= $dbh->prepare(
@@ -3918,8 +3918,16 @@
=cut
-# $Id: Biblio.pm,v 1.207 2007/05/22 08:51:19 hdl Exp $
+# $Id: Biblio.pm,v 1.208 2007/05/22 09:13:54 tipaul Exp $
# $Log: Biblio.pm,v $
+# Revision 1.208 2007/05/22 09:13:54 tipaul
+# Bugfixes & improvements (various and minor) :
+# - updating templates to have tmpl_process3.pl running without any errors
+# - adding a drupal-like css for prog templates (with 3 small images)
+# - fixing some bugs in circulation & other scripts
+# - updating french translation
+# - fixing some typos in templates
+#
# Revision 1.207 2007/05/22 08:51:19 hdl
# Changing GetMarcStructure signature.
# Deleting first parameter $dbh
Index: C4/Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- C4/Circulation.pm 18 May 2007 12:30:27 -0000 1.25
+++ C4/Circulation.pm 22 May 2007 09:13:55 -0000 1.26
@@ -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: Circulation.pm,v 1.25 2007/05/18 12:30:27 btoumi Exp $
+# $Id: Circulation.pm,v 1.26 2007/05/22 09:13:55 tipaul Exp $
use strict;
require Exporter;
@@ -45,7 +45,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.25 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.26 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1193,7 +1193,7 @@
# new op dev : if the book returned in an other branch update the holding branch
# update issues, thereby returning book (should push this out into another subroutine
- $borrower = GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
+ $borrower = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
# case of a return of document (deal with issues and holdingbranch)
@@ -1217,7 +1217,7 @@
$iteminformation->{'holdingbranch'} = C4::Context->userenv->{'branch'};
}
ModDateLastSeen( $iteminformation->{'itemnumber'} );
- ($borrower) = GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
+ ($borrower) = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
# fix up the accounts.....
if ( $iteminformation->{'itemlost'} ) {
@@ -1260,7 +1260,7 @@
# find reserves.....
# if we don't have a reserve with the status W, we launch the Checkreserves routine
my ( $resfound, $resrec ) =
- CheckReserves( $iteminformation->{'itemnumber'} );
+ C4::Reserves::CheckReserves( $iteminformation->{'itemnumber'} );
if ($resfound) {
$resrec->{'ResFound'} = $resfound;
$messages->{'ResFound'} = $resrec;
Index: C4/Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- C4/Context.pm 23 Apr 2007 15:21:17 -0000 1.56
+++ C4/Context.pm 22 May 2007 09:13:55 -0000 1.57
@@ -16,7 +16,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Context.pm,v 1.56 2007/04/23 15:21:17 tipaul Exp $
+# $Id: Context.pm,v 1.57 2007/05/22 09:13:55 tipaul Exp $
use strict;
use DBI;
use ZOOM;
@@ -28,7 +28,7 @@
qw($context),
qw(@context_stack);
-$VERSION = do { my @v = '$Revision: 1.56 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.57 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -475,7 +475,6 @@
my $user = $context->{"serverinfo"}->{$server}->{"user"};
my $servername = $context->{"config"}->{$server};
my $password = $context->{"serverinfo"}->{$server}->{"password"};
- warn "server:$server servername :$servername host:$host";
retry:
eval {
# set options
@@ -875,6 +874,14 @@
=cut
# $Log: Context.pm,v $
+# Revision 1.57 2007/05/22 09:13:55 tipaul
+# Bugfixes & improvements (various and minor) :
+# - updating templates to have tmpl_process3.pl running without any errors
+# - adding a drupal-like css for prog templates (with 3 small images)
+# - fixing some bugs in circulation & other scripts
+# - updating french translation
+# - fixing some typos in templates
+#
# Revision 1.56 2007/04/23 15:21:17 tipaul
# renaming currenttransfers to transferstoreceive
#
Index: C4/Stats.pm
===================================================================
RCS file: /sources/koha/koha/C4/Stats.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- C4/Stats.pm 18 Apr 2007 17:00:14 -0000 1.31
+++ C4/Stats.pm 22 May 2007 09:13:55 -0000 1.32
@@ -1,6 +1,6 @@
package C4::Stats;
-# $Id: Stats.pm,v 1.31 2007/04/18 17:00:14 tipaul Exp $
+# $Id: Stats.pm,v 1.32 2007/05/22 09:13:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -26,7 +26,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = $VERSION = do { my @v = '$Revision: 1.31 $' =~ /\d+/g;
+$VERSION = $VERSION = do { my @v = '$Revision: 1.32 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -80,7 +80,7 @@
# FIXME - Use $dbh->do() instead
my $sth = $dbh->prepare(
"Insert into statistics (datetime,branch,type,value,
- other,itemnumber,itemtype,borrowernumber) values (now(),?,?,?,?,?,?,?,?)"
+ other,itemnumber,itemtype,borrowernumber) values (now(),?,?,?,?,?,?,?)"
);
$sth->execute(
$branch, $type, $amount,
Index: circ/pendingreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/pendingreserves.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- circ/pendingreserves.pl 23 Apr 2007 16:42:59 -0000 1.1
+++ circ/pendingreserves.pl 22 May 2007 09:13:55 -0000 1.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: pendingreserves.pl,v 1.1 2007/04/23 16:42:59 tipaul Exp $
+# $Id: pendingreserves.pl,v 1.2 2007/05/22 09:13:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -25,7 +25,6 @@
use CGI;
use C4::Auth;
use C4::Date;
-use C4::Interface::CGI::Output;
my $input = new CGI;
my $order = $input->param('order');
Index: circ/transferstodo.pl
===================================================================
RCS file: /sources/koha/koha/circ/transferstodo.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- circ/transferstodo.pl 4 May 2007 10:18:00 -0000 1.3
+++ circ/transferstodo.pl 22 May 2007 09:13:55 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: transferstodo.pl,v 1.3 2007/05/04 10:18:00 alaurin Exp $
+# $Id: transferstodo.pl,v 1.4 2007/05/22 09:13:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -75,11 +75,11 @@
foreach my $br ( keys %$branches ) {
my @reservloop;
my %branchloop;
- $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
- $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
my @getreserves =
GetReservesToBranch( $branches->{$br}->{'branchcode'} );
if (@getreserves) {
+ $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
+ $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
foreach my $num (@getreserves) {
my %getreserv;
my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
@@ -124,19 +124,12 @@
if (@reservloop) {
$branchloop{'reserv'} = \@reservloop;
}
-
# else, we unset the value of the branchcode .
else {
$branchloop{'branchcode'} = 0;
}
}
- else {
-
-# if we don't have a retrun from reservestobranch we unset branchname and branchcode
- $branchloop{'branchname'} = 0;
- $branchloop{'branchcode'} = 0;
- }
- push( @branchesloop, \%branchloop );
+ push( @branchesloop, \%branchloop ) if %branchloop;
}
$template->param(
Index: circ/transferstoreceive.pl
===================================================================
RCS file: /sources/koha/koha/circ/transferstoreceive.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- circ/transferstoreceive.pl 4 May 2007 10:18:00 -0000 1.3
+++ circ/transferstoreceive.pl 22 May 2007 09:13:55 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: transferstoreceive.pl,v 1.3 2007/05/04 10:18:00 alaurin Exp $
+# $Id: transferstoreceive.pl,v 1.4 2007/05/22 09:13:55 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -70,12 +70,12 @@
foreach my $br ( keys %$branches ) {
my @transferloop;
my %branchloop;
- $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
- $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
my @gettransfers =
GetTransfersFromTo( $branches->{$br}->{'branchcode'}, $default );
if (@gettransfers) {
+ $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
+ $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
foreach my $num (@gettransfers) {
my %getransf;
@@ -125,13 +125,7 @@
# If we have a return of reservloop we put it in the branchloop sequence
$branchloop{'reserv'} = \@transferloop;
}
- else {
-
-# if we don't have a retrun from reservestobranch we unset branchname and branchcode
- $branchloop{'branchname'} = 0;
- $branchloop{'branchcode'} = 0;
- }
- push( @branchesloop, \%branchloop );
+ push( @branchesloop, \%branchloop ) if %branchloop;
}
$template->param(
Index: koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/auth.tmpl 11 Mar 2007 21:08:11 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/auth.tmpl 22 May 2007 09:13:55 -0000 1.4
@@ -7,8 +7,8 @@
<!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="login">
-<h1><a href="" title=""><span class="hide">Log in to Koha</span></a></h1>
+<div id="main">
+<h1>Log in to Koha</h1>
<!-- TMPL_IF NAME="nopermission" -->
<!-- This is what is displayed if user doesn"t have permission --><h3>Login Error</h3>
<p>Sorry, Koha doesn"t think you have permission for this page.</p>
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl 11 Mar 2007 21:08:11 -0000 1.9
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl 22 May 2007 09:13:55 -0000 1.10
@@ -66,12 +66,13 @@
<!-- /TMPL_IF -->
</div>
-<div id="acqui_acqui_home_budgets">
<!-- TMPL_IF name="nobudget" -->
<!-- TMPL_ELSE -->
<h2>Budgets and Funds</h2>
<a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage Bookfunds ]">[ Manage ]</a>
- <table>
+ <div id="BudgetsAndFunds">
+ <table id="accounts">
+ <thead>
<tr>
<th>Budgets</th>
<th>Total</th>
@@ -79,6 +80,8 @@
<th>Comtd</th>
<th>Avail</th>
</tr>
+ </thead>
+ <tbody>
<!-- TMPL_LOOP name="loop_budget" -->
<tr>
<td><!-- TMPL_VAR name="bookfundname" --></td>
@@ -88,16 +91,19 @@
<td><!-- TMPL_VAR name="avail" --></td>
</tr>
<!-- /TMPL_LOOP -->
+ </tbody>
+ <tfooter>
<tr>
- <td>Total</td>
- <td><!-- TMPL_VAR name="total" --></td>
- <td><!-- TMPL_VAR name="totspent" --></td>
- <td><!-- TMPL_VAR name="totcomtd" --></td>
- <td><!-- TMPL_VAR name="totavail" --></td>
+ <th>Total</td>
+ <th><!-- TMPL_VAR name="total" --></th>
+ <th><!-- TMPL_VAR name="totspent" --></th>
+ <th><!-- TMPL_VAR name="totcomtd" --></th>
+ <th><!-- TMPL_VAR name="totavail" --></th>
</tr>
+ </tfooter>
</table>
+ </div>
<!-- /TMPL_IF -->
-</div>
<div id="acqui_acqui_home_hints">
<p>Use your reload button [ctrl + r] to get the most recent figures.
Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl 11 Mar 2007 21:08:11 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl 22 May 2007 09:13:55 -0000 1.5
@@ -214,7 +214,11 @@
</p>
<p>
<label>Budgeted Cost</label>
- <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <!-- TMPL_IF name="close" -->
+ <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly />
+ <!-- TMPL_ELSE -->
+ <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
+ <!--/TMPL_IF-->
</p>
<!-- TMPL_IF NAME="GST"-->
<p>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 11 Mar 2007 21:08:12 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 22 May 2007 09:13:55 -0000 1.5
@@ -72,7 +72,7 @@
<!-- /TMPL_IF -->
<p><label for="description">Description</label>
<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></p>
- <p> <input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
+ <p> <input type="button" value="Submit" class="submit" onclick="Check(this.form)" /></p>
</form>
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl 11 Mar 2007 21:08:12 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl 22 May 2007 09:13:55 -0000 1.3
@@ -257,7 +257,7 @@
You Searched for <!-- TMPL_VAR NAME="searchfield" -->
<!-- /TMPL_IF -->
- <form action="<TMP_VAR NAME="script_name">" method="post">
+ <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
<input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->">
<input type="reset" name="reset" value="clr">
</form>
@@ -292,7 +292,7 @@
<td><!-- TMPL_VAR NAME="issuelimit" --></td>
<td><!-- TMPL_VAR NAME="reservefee" --></td>
<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
- <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></t$ </tr>
+ <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td></tr>
<!-- /TMPL_LOOP -->
</table>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl 11 Mar 2007 21:08:12 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl 22 May 2007 09:13:55 -0000 1.5
@@ -125,11 +125,11 @@
<label for="notforloan">Not for loan</label>
</th>
<td>
- <input type="checkbox" id="notforloan" name="notforloan"
<!-- TMPL_IF name="notforloan" -->
- checked="checked"
+ <input type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" id="notforloan" name="notforloan" value="1" />
<!-- /TMPL_IF -->
- value="1">
(if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
</td>
</tr>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl 18 Mar 2007 02:46:21 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl 22 May 2007 09:13:56 -0000 1.6
@@ -77,7 +77,7 @@
<tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
<!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
<tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
- <textarea id="value" name="value"cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+ <textarea id="value" name="value" cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="type-textarea" -->
<textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
@@ -85,7 +85,11 @@
<!-- TMPL_IF NAME="type-choice" -->
<select name="value" id="value">
<!-- TMPL_LOOP NAME="options" -->
- <option value="<!-- TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR NAME="option" -->" selected="selected">
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="option" -->">
+ <!-- /TMPL_IF --><!-- TMPL_VAR NAME="option" --></option>
<!-- /TMPL_LOOP -->
</select>
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl 11 Mar 2007 21:08:12 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl 22 May 2007 09:13:56 -0000 1.5
@@ -63,7 +63,7 @@
<p>
<!-- TMPL_IF name="displayprev" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
- <<
+ <<
</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
@@ -76,7 +76,7 @@
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
- >></a>
+ >></a>
<!-- /TMPL_IF -->
</p>
<p>
@@ -118,7 +118,7 @@
<p>
<!-- TMPL_IF name="displayprev" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
- <<
+ <<
</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
@@ -131,7 +131,7 @@
<!-- /TMPL_LOOP -->
<!-- TMPL_IF name="displaynext" -->
<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&&authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
- >></a>
+ >></a>
<!-- /TMPL_IF -->
</p>
</div>
Index: koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl 11 Mar 2007 21:08:12 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl 22 May 2007 09:13:56 -0000 1.4
@@ -48,9 +48,11 @@
Units: <select name="units">
<!-- TMPL_LOOP NAME="units" -->
- <option value="<!-- TMPL_VAR NAME="unit" -->"
- <!-- TMPL_IF NAME="selected" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="desc" --></option>
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR NAME="unit" -->" selected >
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="unit" -->">
+ <!-- /TMPL_IF --><!-- TMPL_VAR NAME="desc" --></option>
<!-- /TMPL_LOOP -->
</select>
Index: koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl 11 Mar 2007 21:08:12 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/barcodes/label-home.tmpl 22 May 2007 09:13:56 -0000 1.4
@@ -12,51 +12,57 @@
<table summary="fields to print">
<tr>
<td>
- <input type="checkbox" name="itemtype" value=1
<!-- TMPL_IF NAME="itemtype"-->
- checked
- <!-- /TMPL_IF --> >
+ <input type="checkbox" name="itemtype" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="itemtype" value=1>
+ <!-- /TMPL_IF -->
<label for="itemtype">Item Type</label>
</td>
<td>
- <input type="checkbox" name="isbn" value=1
- <!-- TMPL_IF NAME="isbn" -->
- checked
- <!-- /TMPL_IF -->>
+ <!-- TMPL_IF NAME="isbn"-->
+ <input type="checkbox" name="isbn" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="isbn" value=1>
+ <!-- /TMPL_IF -->
<label for="isbn">ISBN</label>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="dcn" value=1
- <!-- TMPL_IF NAME="dewey" -->
- checked
- <!-- /TMPL_IF -->>
+ <!-- TMPL_IF NAME="dcn"-->
+ <input type="checkbox" name="dcn" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="dcn" value=1>
+ <!-- /TMPL_IF -->
<label for="dcn">Dewey / Call Number</label>
</td>
<td>
- <input type="checkbox" name="classif" value=1
- <!-- TMPL_IF NAME="class" -->
- checked
- <!-- /TMPL_IF -->>
+ <!-- TMPL_IF NAME="classif"-->
+ <input type="checkbox" name="classif" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="classif" value=1>
+ <!-- /TMPL_IF -->
<label for="classif">Classification</label>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="itemcallnumber" value=1
- <!-- TMPL_IF NAME="itemcallnumber" -->
- checked
- <!-- /TMPL_IF -->>
+ <!-- TMPL_IF NAME="itemcallnumber"-->
+ <input type="checkbox" name="itemcallnumber" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="itemcallnumber" value=1>
+ <!-- /TMPL_IF -->
<label for="itemcallnumber">Item Call Number</label>
</td>
<td>
- <input type="checkbox" name="subclass" value=1
- <!-- TMPL_IF NAME="subclass" -->
- checked
- <!-- /TMPL_IF -->>
+ <!-- TMPL_IF NAME="subclass"-->
+ <input type="checkbox" name="subclass" value=1 checked>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="subclass" value=1>
+ <!-- /TMPL_IF -->
<label for="subclass">Sub-Class</label>
</td>
</tr>
@@ -66,90 +72,98 @@
<h3>Confirm Label Template</h3>
<select name="tmpl_id">
<!-- TMPL_LOOP NAME="label_templates" -->
- <option value="<!-- TMPL_VAR NAME="tmpl_id" -->"
- <!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="tmpl_code" --></option>
+ <!-- TMPL_IF NAME="active" -->
+ <option value="<!-- TMPL_VAR NAME="tmpl_id" -->" selected>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="tmpl_id" -->">
+ <!-- /TMPL_IF -->
+ <!-- TMPL_VAR NAME="tmpl_code" --></option>
<!-- /TMPL_LOOP -->
</select>
<h3>Confirm Barcode Type</h3>
<select name="barcodetype">
- <option value="COOP2of5"
<!-- TMPL_IF NAME="COOP2of5_checked" -->
- selected
- <!--/TMPL_IF -->
- >COOP2of5</option>
- <option value="Code39"
+ <option value="COOP2of5" selected>
+ <!-- TMPL_ELSE -->
+ <option value="COOP2of5" selected>
+ <!-- /TMPL_IF -->COOP2of5</option>
<!-- TMPL_IF NAME="Code39_checked" -->
- selected
- <!-- /TMPL_IF -->
- >Code39</option>
- <option value="EAN13"
+ <option value="Code39" selected>
+ <!-- TMPL_ELSE -->
+ <option value="Code39" selected>
+ <!-- /TMPL_IF -->Code39</option>
<!-- TMPL_IF NAME="EAN13_checked" -->
- selected
- <!-- /TMPL_IF -->
- >EAN13(JAN13)</option>
- <option value="EAN8"
+ <option value="EAN13" selected>
+ <!-- TMPL_ELSE -->
+ <option value="EAN13" selected>
+ <!-- /TMPL_IF -->EAN 13</option>
<!-- TMPL_IF NAME="EAN8_checked" -->
- selected<!-- /TMPL_IF -->
- >EAN8(JAN8)</option>
- <option value="ITF"
+ <option value="EAN8" selected>
+ <!-- TMPL_ELSE -->
+ <option value="EAN8" selected>
+ <!-- /TMPL_IF -->EAN8</option>
<!-- TMPL_IF NAME="ITF_checked" -->
- selected
- <!-- /TMPL_IF -->
- >ITF(Interleaved2of5)</option>
- <option value="Industrial2of5"
+ <option value="ITF" selected>
+ <!-- TMPL_ELSE -->
+ <option value="ITF" selected>
+ <!-- /TMPL_IF -->ITF (Interleaved2of5)</option>
<!-- TMPL_IF NAME="Industrial2of5_checked" -->
- selected
- <!-- /TMPL_IF -->
- >Industrial2of5</option>
- <option value="Matrix2of5"
+ <option value="Industrial2of5" selected>
+ <!-- TMPL_ELSE -->
+ <option value="Industrial2of5" selected>
+ <!-- /TMPL_IF -->Industrial2of5</option>
<!-- TMPL_IF NAME="Matrix2of5_checked" -->
- selected
- <!-- /TMPL_IF -->
- >Matrix2of5</option>
- <option value="NW7"
+ <option value="Matrix2of5" selected>
+ <!-- TMPL_ELSE -->
+ <option value="Matrix2of5" selected>
+ <!-- /TMPL_IF -->Matrix2of5</option>
<!-- TMPL_IF NAME="NW7_checked" -->
- selected
- <!-- /TMPL_IF -->
- >NW7</option>
- <option value="QRcode"
+ <option value="NW7" selected>
+ <!-- TMPL_ELSE -->
+ <option value="NW7" selected>
+ <!-- /TMPL_IF -->NW7</option>
<!-- TMPL_IF NAME="QRcode_checked" -->
- selected
- <!-- /TMPL_IF -->
- >QRcode</option>
- <option value="UPC-A"
+ <option value="QRcode" selected>
+ <!-- TMPL_ELSE -->
+ <option value="QRcode" selected>
+ <!-- /TMPL_IF -->QRcode</option>
<!-- TMPL_IF NAME="UPC-A_checked" -->
- selected
- <!-- /TMPL_IF -->
- >UPC-A</option>
- <option value="UPC-E"
+ <option value="UPC-A" selected>
+ <!-- TMPL_ELSE -->
+ <option value="UPC-A" selected>
+ <!-- /TMPL_IF -->UPC-A</option>
<!-- TMPL_IF NAME="UPC-E_checked" -->
- selected
- <!-- /TMPL_IF -->
- >UPC-E</option>
+ <option value="UPC-E" selected>
+ <!-- TMPL_ELSE -->
+ <option value="UPC-E" selected>
+ <!-- /TMPL_IF -->UPC-E</option>
</select>
</h3>
<h3>Confirm Printing Type</h3>
-<input type="radio" name="printingtype" value="spine"
- <!-- TMPL_IF NAME="printingtype_spine" -->
- checked
- <!--/TMPL_IF -->
- >Spine Labels
-<input type="radio" name="printingtype" value="barcode"
- <!-- TMPL_IF NAME="printingtype_barcode" -->
- checked
- <!--/TMPL_IF -->
- >Barcode Labels
-<input type="radio" name="printingtype" value="both"
- <!-- TMPL_IF NAME="printingtype_both" -->
- checked
- <!--/TMPL_IF -->
- >Both Labels
+<!-- TMPL_IF NAME="printingtype_spine" -->
+ <input type="radio" name="printingtype" value="spine" checked/>
+<!-- TMPL_ELSE -->
+ <input type="radio" name="printingtype" value="spine" />
+<!--/TMPL_IF -->
+ Spine Labels
+<!-- TMPL_IF NAME="printingtype_barcode" -->
+ <input type="radio" name="printingtype" value="barcode" checked />
+<!-- TMPL_ELSE -->
+ <input type="radio" name="printingtype" value="barcode" />
+<!--/TMPL_IF -->
+Barcode Labels
+
+<!-- TMPL_IF NAME="printingtype_both" -->
+ <input type="radio" name="printingtype" value="both" checked />
+<!-- TMPL_ELSE -->
+ <input type="radio" name="printingtype" value="both" />
+<!--/TMPL_IF -->
+Both Labels
<h3>
Start printing from Label number:<input type="textbox" name="startlabel" SIZE="1"
@@ -159,13 +173,12 @@
<p>
<p>
- <input type="checkbox" name="guidebox" value=1
- <!-- TMPL_IF NAME="guidebox"-->
- checked
- <!-- /TMPL_IF -->>
- <label for="guidebox">Draw Guide Boxes</label>
-<p>
-<p>
+<!-- TMPL_IF NAME="guidebox"-->
+ <input type="checkbox" name="guidebox" value=1 checked />
+<!-- TMPL_ELSE -->
+ <input type="checkbox" name="guidebox" value=1 />
+<!-- /TMPL_IF -->
+<label for="guidebox">Draw Guide Boxes</label>
<p>
<input type="submit" value="Submit">
<input type="hidden" name=op value="save_conf">
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 3 Apr 2007 14:21:56 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 22 May 2007 09:13:56 -0000 1.7
@@ -40,7 +40,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="publishercode" -->
<p><label><b>Published by :</b></label>
- <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- 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/catalogue/results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl 30 Apr 2007 14:33:11 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl 22 May 2007 09:13:56 -0000 1.5
@@ -99,35 +99,15 @@
</table>
</form>
<!-- TMPL_ELSE -->
- <div class="searchresults">
- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="myform" id="mainform">
- <!-- TMPL_IF NAME="searchdesc" -->
- <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
- <!-- /TMPL_IF -->
- <!-- RE-SORT START -->
- <!-- TMPL_IF NAME="sort_by_loop" -->
- <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>
- </p>
- <!-- /TMPL_IF -->
- <!-- RESORT END -->
- </form>
-
<!-- ######### -->
-
+ <div id="facets">
<dl>
<!-- FACETS START -->
<!-- TMPL_IF NAME="opacfacets" -->
- <dt id="facets">
+ <dt id="facets1" onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">
Refine Your Search
</dt>
- <dd>
+ <dd id="facets_list" style="display:none;">
<ul>
<!-- TMPL_LOOP NAME="facets_loop" -->
<li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
@@ -153,7 +133,6 @@
</dd>
<!-- /TMPL_IF -->
<!-- FACETS END -->
-
<!-- BULKEDIT START -->
<!--TMPL_IF Name="bulkedit"-->
<dt id="hbulkedit" onclick="var Elt=document.getElementById('parambulkedit');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">
@@ -187,11 +166,29 @@
<!--/TMPL_IF-->
<!-- BULKEDIT END -->
</dl>
-
+ </div>
<!-- ######### -->
+ <div id="searchresults">
+ <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="myform" id="mainform">
+ <!-- TMPL_IF NAME="searchdesc" -->
+ <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
+ <!-- /TMPL_IF -->
+ <!-- RE-SORT START -->
+ <!-- TMPL_IF NAME="sort_by_loop" -->
+ <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>
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- RESORT END -->
+ </form>
<!-- TABLE RESULTS START -->
-
<table>
<tr>
<th> </th>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 17 Apr 2007 16:24:59 -0000 1.9
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 22 May 2007 09:13:56 -0000 1.10
@@ -152,7 +152,7 @@
<!-- TMPL_LOOP Name="trsfitemloop" -->
<tr>
<td>
- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->><!-- TMPL_VAR Name="barcode" --></a>
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a>
</td>
<td>
<p><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</p>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 27 Mar 2007 15:53:40 -0000 1.13
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 22 May 2007 09:13:56 -0000 1.14
@@ -756,13 +756,11 @@
<td><!-- TMPL_VAR NAME="classification" --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
<td>
- <input type="checkbox"
- name="items[]"
- value="<!-- TMPL_VAR NAME="itemnumber" -->"
<!-- TMPL_IF NAME="od" -->
- checked="checked"
+ <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked"/>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
<!-- /TMPL_IF -->
- />
<input type="checkbox"
name="all_items[]"
value="<!-- TMPL_VAR NAME="itemnumber" -->"
@@ -808,19 +806,12 @@
<td><!-- TMPL_VAR NAME="classification" --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
<td>
- <input type="checkbox"
- name="items[]"
- value="<!-- TMPL_VAR NAME="itemnumber" -->"
<!-- TMPL_IF NAME="od" -->
- checked="checked"
+ <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
<!-- /TMPL_IF -->
- />
- <input type="checkbox"
- name="all_items[]"
- value="<!-- TMPL_VAR NAME="itemnumber" -->"
- checked="checked"
- style="display: none;"
- />
+ <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
</td>
</tr>
<!-- /TMPL_LOOP --> <!-- previssues -->
@@ -865,7 +856,7 @@
* This function activate the numlayer div.
*/
function active(numlayer){
- for (i=0; i <= 1 ; i++ ) {
+ for (i=0; i <= 1 ; i++ ) {
var tab;
try{
tab = document.getElementById(i+'XX');
Index: koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 7 May 2007 15:04:50 -0000 1.12
+++ koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 22 May 2007 09:13:56 -0000 1.13
@@ -5,6 +5,8 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<h1>Circulation › Returns</h1>
+
<!-- case of a mistake in transfert loop -->
<!-- TMPL_IF Name="WrongTransfer" -->
<h3 class="problem">This item should not be in this library !</h3>
@@ -47,22 +49,15 @@
<!-- TMPL_IF Name="found" -->
<!-- case of a reservation found, and display info -->
<!-- TMPL_IF Name="waiting" -->
- <h3>Waiting Reserve Found in your library</h3>
- <table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
- <tr>
- <th>Patron: </th>
- <td>
- <ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
- <li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
- <li><!-- TMPL_VAR Name="borstraddress" --><br />
- <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
- <li><!-- TMPL_VAR Name="borphone" --></li>
- </ul>
- </td>
- </tr>
- </table>
+ <h2>Waiting Reserve Found in your library for <!-- TMPL_VAR Name="title" --></h2>
+ <p>Patron:
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+ <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR Name="borcnum" -->)
+ </a>
+ , <!-- TMPL_VAR Name="borstraddress" -->
+ <!-- TMPL_VAR NAME="borzip" --> <!-- TMPL_VAR Name="borcity" -->
+ <!-- TMPL_VAR Name="borphone" -->
+ </p>
<form method="post" action="returns.pl" name="mainform" id="mainform">
<input type="submit" value="Confirm" />
<!-- TMPL_LOOP Name="inputloop" -->
@@ -146,30 +141,28 @@
<!-- case of simple return no issue or transfer but with a reservation -->
<!-- TMPL_IF Name="reserved" -->
<!-- TMPL_IF Name="transfertodo"-->
- <h3>Reserve at an other library, transfer to do</h3>
+ <h2>Reserve at an other library, transfer to do</h2>
<!-- TMPL_ELSE -->
- <h3>Waiting reserve found in your library</h3>
+ <h2>Waiting Reserve Found in your library</h2>
<!-- /TMPL_IF -->
- <table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
- <tr>
- <th>Patron: </th>
- <td>
- <ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
- <li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
- <li><!-- TMPL_VAR Name="borstraddress" --><br />
- <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
- <li><!-- TMPL_VAR Name="borphone" --></li>
- </ul>
- </td>
- </tr>
+ <p>Title: <!-- TMPL_VAR Name="title" --></p>
+ <p>Patron:
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+ <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR Name="borcnum" -->)
+ </a>
+ , <!-- TMPL_VAR Name="borstraddress" -->
+ <!-- TMPL_VAR NAME="borzip" --> <!-- TMPL_VAR Name="borcity" -->
+ <!-- TMPL_VAR Name="borphone" -->
+ </p>
<!-- TMPL_IF name="transfertodo" -->
- <tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="destbranchname" --></td></tr>
+ <p>Transfer to: <!-- TMPL_VAR Name="destbranchname" --></p>
<!-- /TMPL_IF -->
- </table>
<form method="post" action="returns.pl" name="mainform" id="mainform">
- <input type="submit" value="Confirm" />
+ <!-- TMPL_IF name="transfertodo" -->
+ <input type="submit" value="Confirm reserve and transfer" />
+ <!-- TMPL_ELSE -->
+ <input type="submit" value="Confirm reserve" />
+ <!-- /TMPL_IF -->
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
@@ -183,7 +176,6 @@
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
- <h1>Circulation › Returns</h1>
<form method="post" action="/cgi-bin/koha/circ/returns.pl" name="mainform" id="mainform">
<fieldset>
<legend>Enter item barcode</legend>
@@ -239,7 +231,7 @@
</table>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="riloop" -->
- <h2>Returned Items</h2>
+ <h2>Returned items</h2>
<table>
<tr>
<th>Title</th>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl 23 Apr 2007 16:42:59 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl 22 May 2007 09:13:56 -0000 1.2
@@ -11,19 +11,20 @@
<div id="mainbloc">
<h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
+ <!-- TMPL_IF name="branchesloop" -->
<div id="resultlist">
<!-- TMPL_LOOP NAME="branchesloop" -->
<!-- TMPL_IF NAME="branchcode" -->
<table>
<tr>
- <th class="circulation" colspan="5">Reserves in wait to the library : <!-- TMPL_VAR NAME="branchname" --> </th>
+ <th colspan="5">Reserves in wait to the library : <!-- TMPL_VAR NAME="branchname" --> </th>
</tr>
<tr>
- <th class="circulation">Date of reserve</th>
- <th class="circulation">Title</th>
- <th class="circulation">Borrower</th>
- <th class="circulation">Localisation</th>
- <th class="circulation">Action</th>
+ <th>Date of reserve</th>
+ <th>Title</th>
+ <th>Borrower</th>
+ <th>Localisation</th>
+ <th>Action</th>
</tr>
<!-- TMPL_LOOP NAME="reserv" -->
<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
@@ -36,18 +37,23 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
- <!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
- <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
+ <p>
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br />
+ <!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <!-- TMPL_IF NAME="borrowermail" -->
+ <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
+ <!-- TMPL_VAR NAME="borrowermail" -->
+ </a>
+ <!--/TMPL_IF-->
</p>
</td>
<td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
<td>
<form name="dotransfer" action="waitingreservestransfers.pl" method="post">
- <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
- <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
- <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="branchcode" -->">
- <input type="submit" value="Transfer this document">
+ <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+ <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
+ <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+ <input type="submit" value="Transfer this document" />
</form>
</td>
</tr>
@@ -57,5 +63,8 @@
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</div>
+ <!-- TMPL_ELSE -->
+ <p>No transfers to do</p>
+ <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl 23 Apr 2007 15:21:17 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl 22 May 2007 09:13:56 -0000 1.2
@@ -5,8 +5,9 @@
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
<div id="mainbloc">
- <h1 class="circulation">Transfers made TO your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
- <p>You are the destination of this transfer</p>
+ <h1 class="circulation">Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <!-- TMPL_IF name="branchesloop" -->
+ <p>You are the destination of the following transfer(s)</p>
<div id="resultlist">
<!-- TMPL_LOOP NAME="branchesloop" -->
<!-- TMPL_IF NAME="branchcode" -->
@@ -33,9 +34,16 @@
</td>
<td>
<!-- TMPL_IF NAME="borrowername" -->
- <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
- <!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
- <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
+ <p>
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->">
+ <!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
+ </a>
+ <br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <!-- TMPL_IF NAME="borrowermail" -->
+ <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
+ <!-- TMPL_VAR NAME="borrowermail" -->
+ </a>
+ <!--/TMPL_IF-->
</p>
<!-- TMPL_ELSE -->
<p>
@@ -57,5 +65,8 @@
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</div>
+ <!-- TMPL_ELSE -->
+ <p>No transfers to recieve</p>
+ <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl 23 Apr 2007 16:42:59 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreserves.tmpl 22 May 2007 09:13:57 -0000 1.2
@@ -7,7 +7,7 @@
<h1>Circulation: Branch Reserves</h1>
<div id="mainbloc">
- <h1 class="circulation">Reserves of your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <h2 class="circulation">Reserves of your library the : <!-- TMPL_VAR NAME="show_date" --></h2>
<!-- TMPL_IF NAME="messagetransfert" -->
<div>
<h2>Reserve find for the document(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
@@ -77,7 +77,7 @@
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_ELSE -->
- <b>No reserve found.</b>
+ <p><b>No reserve found.</b></p>
<!-- /TMPL_IF -->
</div>
<!-- /TMPL_UNLESS -->
Index: koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc 16 Mar 2007 01:25:09 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc 22 May 2007 09:13:57 -0000 1.5
@@ -3,12 +3,12 @@
<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
<style type="text/css" media="screen">
<!-- TMPL_IF NAME="intranetstylesheet" -->
- @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);
+ @import url(<!-- TMPL_VAR NAME="intranetstylesheet" -->);
<!-- TMPL_ELSE -->
@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="intranetcolorstylesheet" -->
- @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);
+ @import url(<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);
<!-- /TMPL_IF -->
</style>
</head>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css 30 Apr 2007 14:32:15 -0000 1.10
+++ koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css 22 May 2007 09:13:57 -0000 1.11
@@ -1,6 +1,7 @@
body {
font-family : Verdana, Geneva, Arial, sans-serif;
font-size : .9em;
+ background-color:white;
}
h2 {
@@ -12,6 +13,7 @@
border-collapse : inherit;
border : 1px solid #CCCCCC;
margin : 1em 0;
+ border-collapse:collapse;
}
caption {
@@ -88,6 +90,7 @@
color: red;
background-color:white;
font-weight : bold;
+ margin:10px;
}
#admin_stopwords_select UL {
@@ -107,6 +110,7 @@
color: white;
background-color:red;
font-weight : bold;
+ margin:10px;
}
/* css styles for reserves color alerts */
@@ -149,6 +153,13 @@
/* end of css styles for reserves color alerts */
+/* the Koha logo (top left) */
+#kohalogo {
+ position:absolute;
+ left:20px;
+ top:20px;
+}
+
/* MAIN MENU STYLES */
#mainmenu {
display:block;
@@ -317,21 +328,24 @@
}
/* facets bloc */
-dl {
- display:inline;
- float:right;
- margin-top: 15px;
- margin-left: 15px;
- border:1px solid #CCCCCC;
+#facets {
+ position:absolute;
+ right:1em;
}
-dt {
- background-color:#CCCCCC;
+#facets dl {
+ background-color:white;
margin:0px;
- padding:0px;
- font-size:1.1em;
}
+#facets dt {
+ text-align:right;
+ font-weight:bold;
+}
+
+#facets dd {
+ border:1px solid #CCCCCC;
+}
/* bulkedit bloc */
/*#bulkedit {
margin-top: 15px;
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc 10 Mar 2007 01:53:23 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc 22 May 2007 09:13:57 -0000 1.6
@@ -1,8 +1,8 @@
<div id="submenu">
- <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet">Search</a>
+ <a href="/cgi-bin/koha/catalogue/search.pl">Search</a>
<a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a>
<a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a>
- <a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
+ <a href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
<a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
<a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
</div>
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 16 Mar 2007 01:25:09 -0000 1.11
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc 22 May 2007 09:13:57 -0000 1.12
@@ -1,3 +1,6 @@
+<div id="kohalogo">
+ <img src="/intranet-tmpl/prog/images/koha-logo.png" height="60px"/>
+</div>
<div id="onlinehelp">
<a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
</div>
@@ -8,15 +11,15 @@
<ul>
<li>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
- <label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
- <input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
+ <label for="navfindborrower">Issue to:</label>
+ <input id="navfindborrower" name="findborrower" type="text" size="10" />
<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
<input type="submit" class="submit" value="OK" />
</form>
</li>
<li>
- <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>eturns</a>
+ <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Returns</a>
</li>
<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
</ul>
@@ -25,7 +28,7 @@
<a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
<ul>
<li><form action="/cgi-bin/koha/members/member.pl" method="post">
- <label for="navmember">Sear<span class="accesskey">c</span>h: </label>
+ <label for="navmember">Search: </label>
<input id="navmember" type="text" size="10" name="member" />
<input type="submit" value="OK" class="submit" />
</form>
@@ -39,7 +42,7 @@
<form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
<input type="hidden" name="idx" value="" />
<label for="navkeyword">
- <span class="accesskey">S</span>earch:
+ Search:
</label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
<input type="submit" value=" OK " class="submit" />
</form>
Index: koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl 17 Mar 2007 23:29:33 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl 22 May 2007 09:13:57 -0000 1.5
@@ -12,7 +12,7 @@
<form name="language" method="post">
<select name="language">
<!--TMPL_LOOP Name="languages"-->
- <option value="<!--TMPL_VAR Name="value" -->""><!--TMPL_VAR Name="description"-->
+ <option value="<!--TMPL_VAR Name="value" -->"><!--TMPL_VAR Name="description"-->
<!-- </option> -->
<!--/TMPL_LOOP -->
</select>
Index: koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 16 Mar 2007 01:25:09 -0000 1.8
+++ koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 22 May 2007 09:13:57 -0000 1.9
@@ -1,15 +1,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Borrowers › Search Results</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="hd">
-<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-</div>
-<div id="bd">
-<div class="yui-b">
<!-- TMPL_INCLUDE NAME="menus.inc" -->
-</div>
-<div id="yui-main">
-<div class="yui-b">
+
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
<a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a><!-- TMPL_IF NAME="searching" --> › <a>Search Results</a><!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 16 Mar 2007 01:25:09 -0000 1.13
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 22 May 2007 09:13:57 -0000 1.14
@@ -26,7 +26,7 @@
Duplicate ?
<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a>
No, it is not
- <INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
+ <input type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
</div>
</form>
</p>
@@ -69,7 +69,7 @@
<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
<textarea style="display:none;" name="contactnote" cols="70" rows="3" ><!-- TMPL_VAR NAME="contactnote" --></textarea>
- <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->"
+ <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />
<!-- from form 3 -->
<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
Index: koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl 11 Mar 2007 21:08:14 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl 22 May 2007 09:13:57 -0000 1.6
@@ -32,18 +32,41 @@
</tr>
<!-- TMPL_LOOP name="loop_reading" -->
<!-- TMPL_IF NAME="toggle" -->
-<tr class="highlight">
+ <tr class="highlight">
<!-- TMPL_ELSE -->
-<tr>
+ <tr>
<!-- /TMPL_IF -->
- <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
+ <!-- TMPL_IF NAME="returndate" -->
+ <td>
+ <!-- TMPL_ELSE -->
+ <td class="onissue" >
+ <!-- /TMPL_IF -->
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+ <!-- TMPL_VAR name="title" -->
+ </a>
</td>
- <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
- <!-- TMPL_VAR name="author" -->
- </td>
- <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="classification" --></td>
- <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="returndate" -->
+ <td>
+ <!-- TMPL_ELSE -->
+ <td class="onissue">
+ <!-- /TMPL_IF -->
+ <!-- TMPL_VAR name="author" --></td>
+ <!-- TMPL_IF NAME="returndate" -->
+ <td>
+ <!-- TMPL_ELSE -->
+ <td class="onissue">
+ <!-- /TMPL_IF -->
+ <!-- TMPL_VAR NAME="classification" --></td>
+ <!-- TMPL_IF NAME="returndate" -->
+ <td>
+ <!-- TMPL_ELSE -->
+ <td class="onissue">
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="returndate" -->
+ <!-- TMPL_VAR name="returndate" -->
+ <!-- TMPL_ELSE -->
+ Checked Out
+ <!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl 11 May 2007 16:22:03 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl 22 May 2007 09:13:58 -0000 1.7
@@ -61,43 +61,30 @@
</form>
</div>
<!-- /TMPL_IF -->
-<h1>Request for reserve</h1>
+<h1>Reserves</h1>
-<fieldset>
- <legend>Biblio informations</legend>
- <ul>
+ <h2>Biblio informations</h2>
<p><label>Title: </label><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
<p><label>Author: </label><!-- TMPL_VAR NAME="author" --></p>
- </ul>
-</fieldset>
+<h2>Add reserve</h2>
<!-- TMPL_UNLESS NAME="cardnumber"-->
-<form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onSubmit="request.pl" name="getborrower">
- <fieldset>
- <legend>Member search</legend>
+ <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onSubmit="request.pl" name="getborrower">
<!-- TMPL_UNLESS name="CGIselectborrower" -->
<p>
- <label>Member (number or name)</label>
- <input type="text" size="20" name="findborrower">
+ <label>Member</label>
+ <input type="text" size="20" name="findborrower"> (type card number or part of a name)
</p>
- <div id="action">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->">
<input type="submit" value="Search">
- </div>
<!-- TMPL_ELSE -->
<!-- TMPL_VAR NAME="CGIselectborrower" -->
- <div id="action">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->">
<input type="submit" value="Select">
- </div>
<!-- /TMPL_UNLESS -->
-
- </fieldset>
-</form>
+ </form>
<!-- TMPL_ELSE -->
-
<!-- TMPL_IF NAME="maxreserves" -->
- <br>
<p class="problem">
<label><u>Too many reserves</u></label>
Currently, this member has too much active reserves.
@@ -129,11 +116,8 @@
<!-- TMPL_IF NAME="messageborrower" -->
<div class="problem">Carrefull,there is no borrower with this name, Please, try an other </div>
<!-- /TMPL_IF -->
-<!-- /TMPL_UNLESS -->
-
-<form action="placerequest.pl" method="post" onSubmit="return check();" name="form">
- <fieldset>
- <legend>Reservation properties</legend>
+ <h3>Reserve properties</h3>
+ <form action="placerequest.pl" method="post" onSubmit="return check();" name="form">
<input type="hidden" size="10" name="member" value="<!-- TMPL_VAR NAME="cardnumber" -->">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
@@ -160,15 +144,9 @@
<label>Pickup at</label>
<!-- TMPL_VAR NAME="CGIbranch" -->
</p>
- </fieldset>
-
- <fieldset>
- <legend>Items</legend>
-<!-- TMPL_LOOP name="bibitemloop" -->
- <ul>
- <li>Item type: <!-- TMPL_VAR NAME="description" --></li>
- <li>Publication year: <!-- TMPL_VAR NAME="publicationyear" --></li>
- </ul>
+ <!-- TMPL_LOOP name="bibitemloop" -->
+ <p><label>Item type:</label> <!-- TMPL_VAR NAME="description" --></p>
+ <p><label>Publication year:</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
<table>
<tr>
@@ -244,35 +222,26 @@
</tr>
<!-- /TMPL_LOOP --> <!-- itemloop -->
</table>
-<!-- /TMPL_LOOP --> <!-- bibitemloop -->
+ <!-- /TMPL_LOOP --> <!-- bibitemloop -->
- <p>
- <label>
+ <p> <label> </label>
If no item is available, reserve next returning item
<input type="checkbox" name="request" value="Any">
- </label>
</p>
<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
<input type="hidden" name="alreadyreserved" value="<!-- TMPL_VAR NAME="alreadyreserved" -->">
- </fieldset>
-
<div id="actions">
-<!-- TMPL_IF NAME="cardnumber"-->
+ <!-- TMPL_IF NAME="cardnumber"-->
<input type="submit" value="Reserve">
-<!-- TMPL_ELSE -->
- <input type="submit" value="Reserve" value="Reserve" disabled="disabled" style="background-color: gray;" disabled="disabled" title="Search member first">
-<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
</div>
-
-</form>
-
+ </form>
+<!-- /TMPL_UNLESS -->
<!-- TMPL_IF name="reserveloop" -->
+<h2>Existing reserves</h2>
<form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
- <fieldset>
- <legend>Queue list</legend>
-
<table>
<tr>
<th>Priority</th>
@@ -352,7 +321,6 @@
</td>
</tr>
</table>
- </fieldset>
</form>
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl 11 Mar 2007 21:08:14 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl 22 May 2007 09:13:58 -0000 1.6
@@ -134,7 +134,7 @@
Email: <!-- TMPL_VAR NAME="contemail" --><br />
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="accountnumber" -->
- A/C: <!-- TMPL_VAR NAME="accountnumber"></p>
+ A/C: <!-- TMPL_VAR NAME="accountnumber" --></p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="contact" -->
<p>Dear <!-- TMPL_VAR NAME="contact" --></p>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl 11 Mar 2007 21:08:14 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl 22 May 2007 09:13:58 -0000 1.4
@@ -6,11 +6,10 @@
<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
<!--------------------------MAIN BODY OF PAGE-------------------------->
-<h1>Serial Edition: <!-- TMPL_VAR name="bibliotitle" --></h1>
+<h1>Serial Edition <!-- TMPL_VAR name="bibliotitle" --></h1>
<form method="post" name="f" action="serials-edit.pl" >
<!--onsubmit="return barcode_check()">-->
<div id="action">
- <input type="submit" value="Save" class="button" accesskey="w" /> <!--onClick="Check(this.form)" -->
<a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a>
<!--TMPL_LOOP Name="subscriptions"-->
<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription #<!-- TMPL_VAR name="subscriptionid" --></a>
@@ -245,6 +244,7 @@
<!-- /TMPL_LOOP -->
</table>
+ <input type="submit" value="Save" class="button" accesskey="w" /> <!--onClick="Check(this.form)" -->
</div>
</form>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl 11 Mar 2007 21:08:14 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl 22 May 2007 09:13:58 -0000 1.7
@@ -660,9 +660,9 @@
<input type="hidden" name="issuesexpected1" value="0">
-<div>
- <h2>Subscription information <br />for subscription #<!--TMPL_VAR name="subscriptionid"--></h2>
- <table border="0" cellspacing="5" cellpadding="0">
+<div id="subscription_form">
+ <h2>Subscription information for subscription #<!--TMPL_VAR name="subscriptionid"--></h2>
+ <table>
<tr>
<td>Librarian:</td>
<td><!-- TMPL_VAR name="loggedinusername" --></td>
@@ -725,10 +725,11 @@
</tr>
</table>
<div>
+<div id="subscription_form_planning">
<h2>Planning</h2>
- <table border="0" cellspacing="5" cellpadding="0">
+ <table>
<tr>
- <td><label>First Issue ETA:</label></td>
+ <td>First Issue ETA:</td>
<td>
<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;" />
<input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
@@ -755,7 +756,7 @@
</td>
</tr>
<tr>
- <td><label">Frequency: (*)</label></td>
+ <td>Frequency: (*)</td>
<td>
<select name="periodicity" size="1" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
<option value="" selected>-- please choose --</option>
@@ -823,9 +824,7 @@
</td>
</tr>
<tr>
- <td>
- <label>Numbering Pattern:</label>
- </td>
+ <td>Numbering Pattern:</td>
<td>
<select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
<option value="" selected>-- please choose --</option>
@@ -870,7 +869,7 @@
</td>
</tr>
<tr>
- <td><label>Begins On: (*)</label></td>
+ <td>Begins On: (*)</td>
<td>
<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;" />
<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
@@ -978,39 +977,42 @@
</div>
</td></tr>
</table>
+</div>
<!--TMPL_IF Name="history"-->
+<div id="subscription_form_history">
<h2>History</h2>
- <table border="0" cellspacing="5" cellpadding="0">
+ <table>
<tr>
- <td><label>Starting date:</label></td>
+ <td>Starting date:</td>
<td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"> (the date of the 1st subscription)</td>
</tr>
<tr>
- <td><label>Ending date:</label></td>
+ <td>Ending date:</td>
<td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->">(if empty : subscription still active)</td>
</tr>
<tr>
- <td><label>Recieved issues</label></td>
+ <td>Recieved issues</td>
<td><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></td>
</tr>
<tr>
- <td><label>Missing issues</label></td>
- <td><textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td>
+ <td>Missing issues</td>
+ <td><textarea name="missinglist" cols="60" rows="5"><!-- TMPL_VAR name="missinglist" --></textarea></td>
</tr>
<tr>
- <td><label>Opac's notes</label></td>
+ <td>Opac's notes</td>
<td><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></td>
</tr>
<tr>
- <td><label>Librarian notes</label></td>
- <td><textarea name="librariannote" cols="60" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td>
+ <td>Librarian notes</td>
+ <td><textarea name="librariannote" cols="60" rows="5"><!-- TMPL_VAR name="librariannote" --></textarea></td>
</tr>
</table>
+</div>
<!--/TMPL_IF-->
<!-- TMPL_IF name="mod" -->
- <input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
+ <input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w">
<!-- TMPL_ELSE -->
- <input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="button">
+ <input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w">
<!-- /TMPL_IF -->
</form>
</div>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl 11 Mar 2007 21:08:14 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl 22 May 2007 09:13:58 -0000 1.7
@@ -136,7 +136,7 @@
-->
</script>
<h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
- <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end.<br />It should be renewed now.</div><!--/TMPL_IF-->
+ <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end. It should be renewed now.</div><!--/TMPL_IF-->
<div id="action">
<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
<a href="subscription-add.pl?op=dup&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
@@ -154,11 +154,10 @@
</a>
<!-- /TMPL_UNLESS -->
</div>
- <br />
- <fieldset>
- <legend>Subscription information</legend>
+ <div id="subscription_info">
+ <h2>Subscription information</h2>
<p><label>Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p>
- <p><label>Supplier:</label> <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" --> </a></p>
+ <p><label>Supplier:</label> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" --> </a></p>
<p><label>Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></p><br />
<!-- TMPL_IF name="branchcode" --><p><label>Branch :</label> <!-- TMPL_VAR name="branchcode" --> </p><!-- /TMPL_IF -->
<!-- TMPL_IF name="callnumber" --><p><label>Call Number:</label> <!-- TMPL_VAR name="callnumber" --> </p><!-- /TMPL_IF -->
@@ -166,10 +165,9 @@
<!-- TMPL_IF name="notes" --><p><label>Notes:</label> <!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF name="internalnotes" --><p><label>Management Notes:</label> <!-- TMPL_VAR name="internalnotes" --></p><!-- /TMPL_IF -->
- </fieldset>
- <form name="f">
- <fieldset>
- <legend>Planning</legend>
+ </div>
+ <div id="subscription_planning">
+ <h2>Planning</h2>
<p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
</p>
<p><label>Frequency (*):</label>
@@ -206,7 +204,12 @@
<!--TMPL_IF name="periodicity11" -->
1/2 years
<!-- /TMPL_IF -->
- Manual history : <input type="checkbox" <!--TMPL_IF Name="manualhistory"-->checked<!--/TMPL_IF--> disabled>
+ Manual history :
+ <!--TMPL_IF Name="manualhistory"-->
+ <input type="checkbox" checked disabled>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" disabled>
+ <!--/TMPL_IF-->
</p>
<p><label>Number Pattern:</label>
<!-- TMPL_IF name="numberpattern1" -->
@@ -231,16 +234,7 @@
None of the above
<!-- /TMPL_IF -->
</p>
- <table cellpadding="0" cellspacing="0">
- <tr><td> </td>
- <td align="right"><input type="text" name="xfield" style="border:0px solid #FFFFFF; text-align:center;" /></td>
- <!--TMPL_IF NAME="lastvalue2"-->
- <td align="right"><input type="text" name="yfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
- <!--/TMPL_IF-->
- <!--TMPL_IF NAME="lastvalue3"-->
- <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
- <!--/TMPL_IF-->
- </tr>
+ <table>
<tr><td><p><label>Starting with:</label></p></td>
<td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
<!--TMPL_IF NAME="lastvalue2"-->
@@ -276,11 +270,11 @@
<p><label>Begins on:</label>
<!--TMPL_VAR name="startdate" -->
</p>
- </form>
<!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF name="monthlength" --><p><label>Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
- </fieldset>
+ </div>
+ <div id="subscription_numbering">
<h2>Numbering calculation</h2>
<p><label>Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
<table>
@@ -332,10 +326,10 @@
<td><!-- TMPL_VAR name="lastvalue3" --></td>
</tr>
</table>
-</fieldset>
-<fieldset>
- <legend>Serial issues</legend>
- <table cellpadding="0" cellspacing="0">
+ </div>
+ <div id="subscription_issues">
+ <h2>Serial issues</h2>
+ <table>
<tr>
<th>Issue number</th>
<th>Planned date</th>
@@ -366,7 +360,9 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
- <h3>Subscription summary</h3>
+ </div>
+ <div id="subscription_summary">
+ <h2>Subscription summary</h2>
<table cellpadding="0" cellspacing="0">
<tr>
<td><label>Start Date :</label></td>
@@ -381,7 +377,7 @@
<tr><td><label>Librarian's note</label></td><td><!-- TMPL_VAR name="librariannote" --></td></tr>
<tr><td><label>Opac's note</label></td><td><!-- TMPL_VAR name="opacnote" --></td></tr>
</table>
-</fieldset>
+ </div>
</div>
<script type="text/javascript">
function _(s) { return s } // dummy function for gettext
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl 9 Mar 2007 14:48:06 -0000 1.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl 22 May 2007 09:13:58 -0000 1.3
@@ -47,6 +47,7 @@
<input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/>
acquisitions
<input type="submit" value=" OK " />
+ </form>
</li>
</ul>
</div>
@@ -64,6 +65,7 @@
</option>
<!-- /TMPL_LOOP -->
</select>
+ <input type="submit" value="Change" />
</form>
</ul>
</div>
Index: koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 9 Mar 2007 15:43:15 -0000 1.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl 22 May 2007 09:13:59 -0000 1.3
@@ -128,12 +128,12 @@
<!-- RESORT END -->
</form>
<!-- ######### -->
-
<!-- FACETS START -->
<!-- TMPL_IF NAME="opacfacets" -->
- <div id="facets" style="display:inline;" >
- <h2>Refine Your Search</h2>
- <ul>
+ <div id="facets" >
+ <dl>
+ <dt onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">Refine Your Search</dt>
+ <dd id="facets_list" style="display:none">
<!-- TMPL_LOOP NAME="facets_loop" -->
<li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
<ul>
@@ -155,6 +155,7 @@
</li>
<!-- /TMPL_LOOP -->
</ul>
+ </dd>
</div>
<!-- /TMPL_IF -->
<!-- FACETS END -->
@@ -236,7 +237,7 @@
</p>
<!-- /TMPL_IF -->
</td>
- <td style="white-space: nowrap">
+ <td>
<!-- TMPL_IF NAME="items_loop" -->
<span class="available">
<!-- TMPL_LOOP NAME="items_loop" -->
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc 9 May 2007 10:09:40 -0000 1.3
+++ koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc 22 May 2007 09:13:59 -0000 1.4
@@ -1,7 +1,7 @@
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- TMPL_IF name="RSS" -->
- <link rel="alternate" type="application/rss+xml" title="VNUNet.fr - Actualités" href="<!-- TMPL_VAR name="site_url"-->/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->">
+ <link rel="alternate" type="application/rss+xml" title="Koha - RSS" href="<!-- TMPL_VAR name="site_url"-->/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->">
<!-- /TMPL_IF -->
<!-- TMPL_IF name="opacstylesheet" -->
<style type="text/css">
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/includes/opac.css 9 Mar 2007 14:53:34 -0000 1.2
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac.css 22 May 2007 09:13:59 -0000 1.3
@@ -261,18 +261,31 @@
/* facets bloc */
#facets {
- float:right;
- border: 1px solid #CCCCCC;
- margin-top: 5px;
- margin-left: 15px;
+ position:absolute;
+ right:1em;
font-size:0.8em;
+ margin:0px;
+ background-color:#eeeeee;
+ border:1px solid #CCCCCC;
}
-#facets h2 {
- background-color:#EFF1DC;
- border-bottom: 1px solid #CCCCCC;
+
+#facets dl {
+ margin:0px;
+}
+#facets dd {
margin:0px;
- font-size:1em;
}
+#facets dt {
+ font-weight:bold;
+ background-color:#EEC95A;
+ border:0px;
+}
+
+#facets li {
+ list-style-type: none;
+ margin-left:0px;
+}
+
#facets ul {
list-style-type: none;
padding-left:10px;
Index: misc/cronjobs/zebraqueue_start.pl
===================================================================
RCS file: /sources/koha/koha/misc/cronjobs/zebraqueue_start.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/cronjobs/zebraqueue_start.pl 9 Mar 2007 15:44:20 -0000 1.2
+++ misc/cronjobs/zebraqueue_start.pl 22 May 2007 09:13:59 -0000 1.3
@@ -20,7 +20,7 @@
#AGAIN:
#my $wait=C4::Context->preference('zebrawait') || 120;
-my $verbose = 1;
+my $verbose = 0;
print "starting with verbose=$verbose\n" if $verbose;
my ($id,$biblionumber,$operation,$server,$marcxml);
Index: misc/migration_tools/rebuild_zebra.pl
===================================================================
RCS file: /sources/koha/koha/misc/migration_tools/rebuild_zebra.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- misc/migration_tools/rebuild_zebra.pl 10 May 2007 14:45:15 -0000 1.8
+++ misc/migration_tools/rebuild_zebra.pl 22 May 2007 09:13:59 -0000 1.9
@@ -14,7 +14,7 @@
$|=1; # flushes output
# limit for database dumping
-my $limit;# = "LIMIT 500";
+my $limit;# = "LIMIT 1000";
my $directory;
my $skip_export;
my $keep_export;
@@ -38,8 +38,8 @@
my $kohadir = C4::Context->config('intranetdir');
my $dbh = C4::Context->dbh;
-my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField($dbh,"biblio.biblionumber","");
-my ($biblioitemnumbertagfield,$biblioitemnumbertagsubfield) = &GetMarcFromKohaField($dbh,"biblioitems.biblioitemnumber","");
+my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField("biblio.biblionumber","");
+my ($biblioitemnumbertagfield,$biblioitemnumbertagsubfield) = &GetMarcFromKohaField("biblioitems.biblioitemnumber","");
print "some informations\n";
print "=================\n";
@@ -183,7 +183,7 @@
}
$created_dir_or_file++;
}
- unless (-f "$authorityserverdir/tab/sort-string-utf_french.chr") {
+ unless (-f "$authorityserverdir/tab/sort-string-utf.chr") {
system("cp -f $kohadir/misc/zebra/sort-string-utf_french.chr $authorityserverdir/tab/sort-string-utf.chr");
print "Info: copied sort-string-utf.chr\n";
$created_dir_or_file++;
@@ -290,7 +290,7 @@
$sth->execute();
my $i=0;
while (my ($authid) = $sth->fetchrow) {
- my $record = AUTHgetauthority($dbh,$authid);
+ my $record = GetAuthority($authid);
print ".";
print "\r$i" unless ($i++ %100);
print OUT $record->as_usmarc();
@@ -304,7 +304,6 @@
print "====================\n";
print "REINDEXING zebra\n";
print "====================\n";
-warn ">>>>>>>>>>>>>>>".C4::Context->zebraconfig('authorityserver')->{config};
system("zebraidx -c ".C4::Context->zebraconfig('authorityserver')->{config}." -g iso2709 -d authorities init") if ($reset);
system("zebraidx -c ".C4::Context->zebraconfig('authorityserver')->{config}." -g iso2709 -d authorities update $directory/authorities");
system("zebraidx -c ".C4::Context->zebraconfig('authorityserver')->{config}." -g iso2709 -d authorities commit");
@@ -373,7 +372,7 @@
}
$created_dir_or_file++;
}
- unless (-f "$biblioserverdir/tab/sort-string-utf_french.chr") {
+ unless (-f "$biblioserverdir/tab/sort-string-utf.chr") {
system("cp -f $kohadir/misc/zebra/sort-string-utf_french.chr $biblioserverdir/tab/sort-string-utf.chr");
print "Info: copied sort-string-utf.chr\n";
$created_dir_or_file++;
@@ -481,8 +480,8 @@
my $i=0;
while (my ($biblionumber) = $sth->fetchrow) {
my $record = GetMarcBiblio($biblionumber);
- warn $record->as_formatted;
-die if $record->subfield('090','9') eq 11;
+# warn $record->as_formatted;
+# die if $record->subfield('090','9') eq 11;
# print $record;
# check that biblionumber & biblioitemnumber are stored in the MARC record, otherwise, add them & update the biblioitems.marcxml data.
my $record_correct=1;
@@ -558,7 +557,6 @@
print "====================\n";
print "REINDEXING zebra\n";
print "====================\n";
-warn ">>>>>>>>>>>>>".C4::Context->zebraconfig('biblioserver')->{config};
system("zebraidx -g iso2709 -c ".C4::Context->zebraconfig('biblioserver')->{config}." -d biblios init") if ($reset);
system("zebraidx -g iso2709 -c ".C4::Context->zebraconfig('biblioserver')->{config}." -d biblios update $directory/biblios");
system("zebraidx -g iso2709 -c ".C4::Context->zebraconfig('biblioserver')->{config}." -d biblios commit");
Index: misc/migration_tools/22_to_30/rebuild_unimarc_100.pl
===================================================================
RCS file: /sources/koha/koha/misc/migration_tools/22_to_30/rebuild_unimarc_100.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- misc/migration_tools/22_to_30/rebuild_unimarc_100.pl 4 May 2007 16:24:09 -0000 1.3
+++ misc/migration_tools/22_to_30/rebuild_unimarc_100.pl 22 May 2007 09:13:59 -0000 1.4
@@ -17,10 +17,12 @@
my $sth=$dbh->prepare("select biblionumber,timestamp from biblioitems");
$sth->execute();
+$|=1; # flushes output
+print "Creating/updating field 100 if needed\n";
while (my ($biblionumber,$time)=$sth->fetchrow ){
# my $record;
my $record = GetMarcBiblio($biblionumber);
-#print $record->as_marc;
+# print $record->as_formatted;
MARCmodrecord($biblionumber,$record,$time);
#
}
@@ -45,14 +47,9 @@
unless ($record->subfield(100,"a")){
$record->insert_fields_ordered(MARC::Field->new(100,"","","a"=>"$string"));
}
-# warn "APRES : ".$record->as_formatted;
- # delete all items related fields
- foreach ($record->field('995')) {
- $record->delete_field($_);
- }
if ($update){
&ModBiblioMarc($record,$biblionumber,'');
- print "$biblionumber \n";
+ print "\r$biblionumber" unless ( $biblionumber % 100 );
}
}
Index: misc/translator/po/prog_opac_fr.po
===================================================================
RCS file: /sources/koha/koha/misc/translator/po/prog_opac_fr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- misc/translator/po/prog_opac_fr.po 9 Mar 2007 15:46:48 -0000 1.1
+++ misc/translator/po/prog_opac_fr.po 22 May 2007 09:13:59 -0000 1.2
@@ -1,5 +1,6 @@
-# translation of prog_opac_fr_10.po to fr_FR
+# translation of prog_opac_fr.po to
# POULAIN <paul at koha-fr.org>, 2006, 2007.
+# paul POULAIN <paul at koha-fr.org>, 2007.
# translation of prog_opac_fr_6.po to
# translation of prog_opac_fr_5.po~.po to
# translation of prog_opac_fr_5.po to
@@ -8,11 +9,11 @@
# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
msgid ""
msgstr ""
-"Project-Id-Version: prog_opac_fr_10\n"
-"POT-Creation-Date: 2007-01-26 14:52+0100\n"
-"PO-Revision-Date: 2007-01-26 14:59+0100\n"
-"Last-Translator: POULAIN <paul at koha-fr.org>\n"
-"Language-Team: fr_FR\n"
+"Project-Id-Version: prog_opac_fr\n"
+"POT-Creation-Date: 2007-05-18 16:44+0200\n"
+"PO-Revision-Date: 2007-05-18 16:46+0200\n"
+"Last-Translator: paul POULAIN <paul at koha-fr.org>\n"
+"Language-Team: <fr at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@
"\n"
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid " item(s) added to your book bag"
msgstr "Document(s) ajouté(s) à votre panier"
@@ -33,6 +34,12 @@
msgid "$%s"
msgstr "%s €"
+#. %1$S: type=text name=recentacqui
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:47
+#, c-format
+msgid "%S acquisitions"
+msgstr "%S Acquisitions"
+
#. %1$s: TMPL_VAR name=firstname
#. %2$s: TMPL_VAR name=surname
#. %3$s: TMPL_VAR name=cardnumber
@@ -44,15 +51,15 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=LibraryNameTitle
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:2
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:1
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl:1
#, c-format
msgid "%s -- Library Catalog"
msgstr "%s -- Catalogue de la bibliothèque"
#. %1$s: TMPL_VAR name=subtitle
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:53
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:55
#, c-format
msgid "%s ;"
msgstr "%s ;"
@@ -71,16 +78,16 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=LibraryNameTitle
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:1
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:1
#, c-format
msgid "%s Catalog --"
msgstr "Catalogue %s"
#. For the first occurrence,
#. %1$s: TMPL_VAR name=LibraryNameTitle
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl:1
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl:1
#, c-format
msgid "%s Catalog -- Account for"
@@ -92,7 +99,9 @@
msgid "%s Catalog -- Add to My Book List"
msgstr "Catalogue %s --Ajouter à mon étagère"
-#. %1$s: TMPL_VAR name=LibraryNameTitle
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=LibraryName
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:2
#, c-format
msgid "%s Catalog -- Advanced Search"
@@ -114,8 +123,8 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=LibraryNameTitle
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-tags_subject.tmpl:1
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:1
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-browser.tmpl:1
#, c-format
msgid "%s Catalog -- ISBD"
@@ -124,8 +133,8 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=LibraryName
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-showreviews.tmpl:1
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:2
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-review.tmpl:1
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:2
#, c-format
msgid "%s Catalog -- Library Home for"
msgstr "Catalogue %s -- Accueil bibliothèque de"
@@ -190,7 +199,9 @@
msgid "%s Catalog -- Your Book Bag"
msgstr "%s Catalogue -- Votre panier"
-#. %1$s: TMPL_VAR name=used
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=count
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl:9
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl:52
#, c-format
msgid "%s biblios"
@@ -204,14 +215,14 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=shelfbookcount
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:153
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:157
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:204
#, c-format
msgid "%s item(s)"
msgstr "%s document(s)"
#. %1$s: TMPL_VAR name=count
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:155
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:157
#, c-format
msgid "%s items"
msgstr "%s exemplaire(s)"
@@ -231,10 +242,11 @@
msgstr "%s notice(s)"
#. %1$s: TMPL_VAR name=total
+#. %2$s: TMPL_VAR name=searchdesc
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:28
#, c-format
-msgid "%s results found."
-msgstr "%s résultat(s)"
+msgid "%s results found for '%s'. <a1>[ Perform a new search ]</a>"
+msgstr "%s réponses trouvées pour '%s' <a1>[Nouvelle recherche]</a>"
#. %1$s: TMPL_VAR name=weeklength
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl:75
@@ -279,7 +291,7 @@
msgid "<<"
msgstr "<<"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:278
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:285
msgid "<< Previous"
msgstr "<<Précédent"
@@ -352,20 +364,21 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=itemcallnumber
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:166
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:46
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:51
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl:69
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:237
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:238
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:51
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:81
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:48
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:168
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:244
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:245
#, c-format
msgid "(%s)"
msgstr "(%s)"
#. %1$s: TMPL_VAR name=classification
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:240
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:247
#, c-format
msgid "(<a1> %s </a>)"
msgstr "(<a1> %s </a>)"
@@ -378,7 +391,7 @@
msgid "(<a1>Click here</a> if you're not %s %s %s)"
msgstr "(<a1>Cliquer ici</a> si vous n'êtes pas %s %s %s)"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:33
#, c-format
msgid "(<a1>more search options</a>)"
msgstr "(<a1>Recherche avancée</a>)"
@@ -388,12 +401,12 @@
msgstr "(En prêt)"
#. %1$s: TMPL_VAR name=subscriptionsnumber
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:202
#, c-format
msgid "(We have %s subscriptions associated with this title)."
msgstr "(Nous avons %s abonnement(s) associé(s) à ce titre)."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:61
msgid ""
"(add % at the end of your word if you want to use right-truncation : <b>theor"
"%</b> will find theory & theories)"
@@ -402,7 +415,7 @@
"droite : <b>théor%</b> renverra à théorie & théorique)"
#. %1$s: TMPL_VAR name=timestamp
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:228
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:235
#, c-format
msgid "(modified on %s)"
msgstr "(modifié le %s)"
@@ -411,13 +424,19 @@
msgid "(no time limit)"
msgstr "(sans limite de temps)"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:101
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:110
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:118
+msgid "(no title)"
+msgstr "(pas de titre)"
+
#. %1$s: TMPL_VAR name=newdate
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:18
#, c-format
msgid "(published on %s)"
msgstr "(Publié le %s)"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:189
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:193
msgid ", but managed only by you."
msgstr ", mais gérée uniquement par vous."
@@ -445,18 +464,18 @@
"bibliothèque a été signalée comme perdue ou volée."
#. For the first occurrence,
-#. %1$s: TMPL_VAR name=marcnote
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:118
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:204
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:206
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:120
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:222
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:223
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:225
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:74
+#. %1$s: TMPL_VAR name=publicationyear
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:80
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:81
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:122
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:206
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:208
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:229
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:230
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:232
#, c-format
msgid "- %s"
msgstr "- %s"
@@ -475,7 +494,7 @@
msgid "...Or Choose Acceptable Formats"
msgstr "...ou sélectionnez les types de documents souhaités"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:30
msgid "...or..."
msgstr "... ou ..."
@@ -499,8 +518,8 @@
msgid "2 years"
msgstr "2 ans"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl:34
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl:34
msgid "3 months"
msgstr "3 mois"
@@ -515,17 +534,17 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=subtitle
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl:6
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:226
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:233
#, c-format
msgid ": %s"
msgstr ": %s"
#. For the first occurrence,
#. %1$s: TMPL_VAR name=place
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:224
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:227
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:82
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:231
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:234
#, c-format
msgid "; %s"
msgstr "; %s"
@@ -567,12 +586,12 @@
msgid "<a1>%s</a>,"
msgstr "<a1>%s</a>,"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:35
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:36
#, c-format
msgid "<a1>Browse the Catalogue</a>, through a hierarchy of subjects"
msgstr "<a1>Feuilleter le catalogue</a>, grâce à une hiérarchie de sujets"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:77
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:79
#, c-format
msgid "<a1>Click here</a> for more information on subscription(s) history"
msgstr ""
@@ -584,7 +603,8 @@
msgid "<a1>Log In</a> to Koha"
msgstr "<a1>S'identifier</a> dans Koha"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:274
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:277
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:110
#, c-format
msgid "<a1>Log in to your account</a> to write a review here."
msgstr "<a1> Connecter vous à votre compte</a> pour écrire votre commentaire ici."
@@ -598,8 +618,8 @@
#, c-format
msgid "<a1>Send</a> <a2>Print</a> <a3>Empty and Close</a> <a4>Hide Window</a>"
msgstr ""
-"<a1>Envoyer</a> <a2>Imprimer</a>"
-"<a3>Vider et fermer</a> <a4>Fermer la fenêtre</a>"
+"<a1>Envoyer</a> <a2>Imprimer</a><a3>Vider et fermer</a> <a4>Fermer la "
+"fenêtre</a>"
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc:2
#, c-format
@@ -616,8 +636,8 @@
msgstr "<b>Documents sélectionnés :</b> <a1> Retirer </a>"
#. A
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead_adv.inc:3
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:19
msgid "A "shopping cart" for your selections"
msgstr "Un \"panier\" pour vos sélections"
@@ -651,7 +671,7 @@
msgstr "Relevé de compte de %s %s"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:112
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:116
msgid "Add"
msgstr "Ajouter"
@@ -662,11 +682,11 @@
msgstr "Ajouter <i>%s</i>"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:141
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:145
msgid "Add New Shelf"
msgstr "Créer une étagère"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:103
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:107
msgid "Add an Item to this Shelf by Barcode"
msgstr "Ajouter un document à cette étagère par Code à barres"
@@ -676,7 +696,12 @@
msgstr "Ajouter un autre champ"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:203
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:167
+msgid "Add checked items to book bag"
+msgstr "Ajouter à mon panier"
+
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:207
msgid "Add or Remove Book Shelves"
msgstr "Créer ou Supprimer une (des) étagère(s)"
@@ -686,41 +711,42 @@
msgid "Add these %s biblios to a shelf"
msgstr "Ajouter ces %s documents à l'étagère"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:32
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl:30
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:31
msgid "Add to My Book Bag"
msgstr "Ajouter à mon panier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:26
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:27
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl:26
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:27
msgid "Add to My Book List"
msgstr "Ajouter à mon étagère virtuelle"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:34
msgid "Add to a New Bookshelf:"
msgstr "Ajouter à une nouvelle étagère :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:35
msgid "Add to a shelf"
msgstr "Ajouter à une étagère"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:90
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:89
msgid "Add to bookbag"
msgstr "Ajouter à mon panier"
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:25
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:28
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:46
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:47
msgid "Add to virtual shelf"
msgstr "Ajouter à l'étagère"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:285
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:288
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:121
msgid "Add your own review"
msgstr "Ajoutez votre commentaire"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:66
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:68
msgid "Additional Author:"
msgstr "Autres auteurs:"
@@ -736,8 +762,8 @@
msgid "Advanced Search"
msgstr "Recherche avancée"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:409
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:26
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:409
msgid "All branches"
msgstr "Tous sites"
@@ -745,19 +771,20 @@
msgid "All item types"
msgstr "Tous types de documents"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:129
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:131
msgid "Alt title:"
msgstr "Autre titre:"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:59
msgid "Alternate Contact Details"
msgstr "Coordonnées d'un autre contact"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:63
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:61
msgid "Alternate Contact:"
msgstr "Autre contact :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:281
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:284
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:117
msgid "Amazon Reader Reviews:"
msgstr "Les commentaires des lecteurs d'Amazon :"
@@ -813,25 +840,26 @@
msgid "Anyone"
msgstr "Tout le monde"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:47
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:49
msgid "Anywhere"
msgstr "Partout"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:59
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:222
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:47
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:224
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:61
msgid "Arrived"
msgstr "Arrivé"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:80
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:16
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:54
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl:20
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:33
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:72
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:31
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:16
msgid "Author"
msgstr "Auteur"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:59
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:61
msgid "Author:"
msgstr "Auteur :"
@@ -843,6 +871,13 @@
msgid "Authorities Headings"
msgstr "Vedettes autorités"
+#. %1$s: TMPL_VAR name=authid
+#. %2$s: TMPL_VAR name=authtypetext
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl:8
+#, c-format
+msgid "Authority #%s (%s)"
+msgstr "Autorité #%s (%s)"
+
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:7
msgid "Authority search"
msgstr "Recherche autorité"
@@ -855,7 +890,7 @@
msgid "Authorized Headings"
msgstr "Vedettes autorisées"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:69
msgid "Authors"
msgstr "Auteurs"
@@ -882,7 +917,7 @@
msgid "Autres types de documents graphique non projetable"
msgstr "Autres types de documents graphiques non projetables"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:178
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:180
msgid "Available"
msgstr "Disponible"
@@ -891,8 +926,8 @@
msgid "Available in the library"
msgstr "Disponible à la bibliothèque"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:9
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:159
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:163
msgid "Back to Virtual Shelves"
msgstr "Retour aux étagères virtuelles"
@@ -910,11 +945,11 @@
msgstr "Code à barres"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:106
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:110
msgid "Barcode:"
msgstr "Code à barres :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:40
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:42
msgid "Below is a list of the three latest issues :"
msgstr "Ci-dessous les 3 derniers numéros parus :"
@@ -968,8 +1003,8 @@
msgstr "Panier"
#. IMG
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:39
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:41
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:43
msgid "Book Cover Image"
msgstr "Image de couverture"
@@ -1028,7 +1063,7 @@
msgid "CD audio"
msgstr "CD audio"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:32
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:34
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:109
msgid "Call No."
msgstr "Cote"
@@ -1078,14 +1113,14 @@
msgstr "Catalogue"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:198
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:202
msgid "Category"
msgstr "Catégorie"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:40
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:134
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:170
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:138
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:174
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:41
msgid "Category:"
msgstr "Catégorie :"
@@ -1093,7 +1128,7 @@
msgid "Champs Codés"
msgstr "Critères annexes"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:48
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:56
msgid "Change language"
msgstr "Changer la langue"
@@ -1101,7 +1136,7 @@
msgid "Change your Password"
msgstr "Modifiez votre mot de passe"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:29
msgid "Check All"
msgstr "Tout cocher"
@@ -1109,11 +1144,11 @@
msgid "Choose Either..."
msgstr "Choisissez un exemplaire..."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:19
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:24
msgid "City, State"
msgstr "Ville, Département"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:144
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:146
msgid "Classification"
msgstr "Classification"
@@ -1123,7 +1158,17 @@
msgid "Classification: %s"
msgstr "Indexation %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:27
+#. INPUT type=reset
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:168
+msgid "Clear All"
+msgstr "Effacer"
+
+#. INPUT type=checkbox name=biblionumber
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:188
+msgid "Click to add to book bag"
+msgstr "Ajouter à mon panier"
+
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:32
msgid ""
"Clicking 'Submit Changes' will send an email to a library staff member with "
"the information you've entered. You will then be returned to your patron "
@@ -1142,7 +1187,7 @@
msgid "Collage"
msgstr "Collage"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:91
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:93
msgid "Collection"
msgstr "Collection"
@@ -1150,7 +1195,7 @@
msgid "Collection des monographies"
msgstr "Collection de monographies"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:98
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:100
msgid "Collection:"
msgstr "Collection :"
@@ -1192,12 +1237,12 @@
msgstr "Coordonnées complètes"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:198
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:202
msgid "Content Size"
msgstr "Nombre de documents"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:149
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:153
msgid "Contents"
msgstr "Contient"
@@ -1205,7 +1250,7 @@
#. For the first occurrence,
#. %1$s: TMPL_VAR name=shelfname
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:1
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:7
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:9
#, c-format
msgid "Contents of %s"
msgstr "Contenu de %s"
@@ -1223,7 +1268,7 @@
msgid "Copies"
msgstr "Exemplaires"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:108
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:110
msgid "Copyright"
msgstr "Copyright"
@@ -1245,7 +1290,7 @@
msgid "Count"
msgstr "Nombre"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:130
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:134
msgid "Create a New a Virtual Shelf"
msgstr "Créer une étagère virtuelle"
@@ -1261,15 +1306,16 @@
msgid "DVD video / Videodisc"
msgstr "DVD / vidéo disque"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:47
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl:17
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:208
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:89
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:210
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl:17
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:49
msgid "Date"
msgstr "Date"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:161
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:163
msgid "Date Due"
msgstr "Date de retour"
@@ -1278,21 +1324,21 @@
msgstr "Date de réception"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:97
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:98
msgid "Delete Checked Items"
msgstr "Supprimer les références cochées"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:157
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:161
msgid "Delete Shelves"
msgstr "Supprimer les étagères cochées"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:147
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:151
msgid "Delete Virtual Shelves"
msgstr "Supprimer étagère(s) virtuelle(s)"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:75
msgid "Delete this Shelf"
msgstr "Supprimer cette étagère"
@@ -1316,7 +1362,7 @@
msgid "Detailed notes:"
msgstr "Notes détaillées :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:85
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:87
msgid "Details"
msgstr "Détails"
@@ -1324,11 +1370,11 @@
msgid "Deux fois par mois"
msgstr "Deux fois par mois"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:138
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:140
msgid "Dewey"
msgstr "Dewey"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:135
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:137
msgid "Dewey:"
msgstr "Dewey :"
@@ -1355,7 +1401,7 @@
msgid "Did you mean:"
msgstr "Vouliez-vous dire :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:41
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:42
#, c-format
msgid "Dig into <a1>tag cloud</a>"
msgstr "Chercher dans le <a1>nuage de sujets</a>"
@@ -1414,7 +1460,7 @@
msgstr "Facile"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:30
msgid "Email"
msgstr "Email"
@@ -1436,7 +1482,7 @@
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:2
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:9
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:105
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:106
msgid "Enter a new purchase suggestion"
msgstr "Créer une suggestion d'achat"
@@ -1516,7 +1562,7 @@
msgid "First Name"
msgstr "Prénom"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:187
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:189
msgid "Fix Itemtype"
msgstr "Choisir le type de document"
@@ -1540,10 +1586,10 @@
msgid "Formulaires"
msgstr "Formulaires"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:137
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:182
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:184
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:141
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:186
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:188
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:204
msgid "Free"
msgstr "Libre"
@@ -1556,15 +1602,19 @@
msgstr "Vedettes autorisées complètes"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:97
msgid "GO"
msgstr "OK"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:46
+msgid "Get the last"
+msgstr "Trouver les derniers"
+
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:376
msgid "Gravure"
msgstr "Gravure"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:71
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:69
msgid "Guarantor:"
msgstr "Garant :"
@@ -1585,7 +1635,7 @@
"ligne Koha par %s"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:26
msgid "Home Phone"
msgstr "Téléphone domicile"
@@ -1593,16 +1643,16 @@
msgid "Humour, satire"
msgstr "Humour, satire"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:36
msgid "ISBD"
msgstr "ISBD"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:62
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:79
msgid "ISBN"
msgstr "ISBN"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:92
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:94
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl:16
msgid "ISBN:"
msgstr "ISBN :"
@@ -1617,7 +1667,7 @@
msgid "ISSN"
msgstr "ISSN"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:95
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:97
msgid "ISSN:"
msgstr "ISSN :"
@@ -1660,7 +1710,7 @@
msgid "Il ne s'agit pas d'un texte litteraire"
msgstr "Il ne s'agit pas d'un texte littéraire"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:75
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:77
msgid "Illus:"
msgstr "Ill.:"
@@ -1722,16 +1772,16 @@
msgid "Isorel"
msgstr "Isorel"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:207
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:209
msgid "Issue #"
msgstr "Numéro"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:47
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:49
msgid "Issue number"
msgstr "Numéro paru"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:152
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:152
msgid "Issues"
msgstr "Prêts"
@@ -1755,7 +1805,7 @@
msgid "It began on %s and is issued every"
msgstr "Débute le %s et paraît tous les"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:178
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:180
msgid "Item Cancelled"
msgstr "Document supprimé"
@@ -1767,15 +1817,15 @@
msgid "Item Types:"
msgstr "Types de document :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:176
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:178
msgid "Item lost"
msgstr "Document perdu"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:158
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:160
msgid "Item type"
msgstr "Type de document"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:144
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:146
msgid "Item type :"
msgstr "Type de document :"
@@ -1825,7 +1875,7 @@
msgid "Kits"
msgstr "Kits"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:150
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:152
msgid "LCCN"
msgstr "LCCN"
@@ -1856,9 +1906,9 @@
msgid "Last Seen"
msgstr "Vu le"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:61
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:224
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:48
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:226
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:63
msgid "Late"
msgstr "En retard"
@@ -1903,10 +1953,10 @@
msgid "Local History Materials"
msgstr "Documents d'histoire locale"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:160
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:159
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:161
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:162
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl:59
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:170
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:174
msgid "Location"
msgstr "Localisation"
@@ -1915,8 +1965,8 @@
msgstr "Localisation et disponibilité :"
#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:50
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl:39
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:53
msgid "Log In"
msgstr "Se connecter"
@@ -1924,10 +1974,10 @@
msgid "Log In to Your Account"
msgstr "Vous connectez à votre compte"
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead_adv.inc:13
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:39
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/opac-basket-bottom.inc:5
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:38
msgid "Log Out"
msgstr "Déconnexion"
@@ -1935,8 +1985,8 @@
msgid "Log in to access"
msgstr "Se connecter pour accéder"
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead_adv.inc:10
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc:5
msgid "Logged in as"
msgstr "Connecté en tant que"
@@ -1947,12 +1997,12 @@
msgstr "Connecté en tant que <b>%s</b> <a1>Accueil Lecteurs</a>"
#. %1$s: TMPL_VAR name=loggedinusername
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:38
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:37
#, c-format
msgid "Logged in as: <b> %s </b>"
msgstr "Connecté en tant que <b> %s </b>"
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:45
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:42
msgid "Login:"
msgstr "Nom d'utilisateur :"
@@ -1961,7 +2011,7 @@
msgstr "Lois et décrets"
#. %1$s: TMPL_VAR name=itemlostcount
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:251
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:258
#, c-format
msgid "Lost (%s)"
msgstr "Perdu (%s)"
@@ -1970,7 +2020,7 @@
msgid "MARC View"
msgstr "Vue MARC"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:17
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:18
msgid "Mailing Address"
msgstr "Adresse E-mail"
@@ -1978,7 +2028,7 @@
msgid "Mailing Address:"
msgstr "Adresse électronique :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:36
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:37
msgid "Main entry"
msgstr "Entrée principale"
@@ -2044,29 +2094,29 @@
msgid "Micro-impression"
msgstr "Micro-impression"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:63
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:226
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:49
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:228
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:65
msgid "Missing"
msgstr "Manquant"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:204
msgid "Modify"
msgstr "Modifiez"
#. %1$s: TMPL_VAR name=shelfname
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:166
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:170
#, c-format
msgid "Modify Virtual Shelf %s"
msgstr "Modifiez l'étagère virtuelle %s"
#. INPUT type=submit name=Modify
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:75
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:76
msgid "Modify Your Record"
msgstr "Modifiez vos informations"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:13
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:15
msgid "Modify this Shelf"
msgstr "Modifier cette étagère"
@@ -2133,7 +2183,7 @@
#. INPUT type=submit
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl:81
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:292
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:299
msgid "Next >>"
msgstr "Suivant >>"
@@ -2154,8 +2204,12 @@
msgid "No Result found !"
msgstr "Pas de réponse !"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl:152
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:72
+msgid "No alternate contact."
+msgstr "Pas d'autre contact."
+
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl:76
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl:152
msgid "No copies available."
msgstr "Pas d'exemplaire disponible."
@@ -2169,12 +2223,12 @@
"\"Note\" peut être utilisé pour ajouter ce que vous voulez."
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "No item was added to your book bag"
msgstr "Aucun document ajouté dans votre panier"
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "No item was selected"
msgstr "Aucun document sélectionné"
@@ -2203,7 +2257,8 @@
msgid "No results match your search for"
msgstr "Aucun résultat ne correspond à votre recherche"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:267
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:270
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:103
msgid "No reviews has been writed on this biblio."
msgstr "Il n'y a pas de commentaire sur ce document."
@@ -2219,8 +2274,8 @@
msgid "Normalement irregulier"
msgstr "Normalement irrégulier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:65
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:228
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:230
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:67
msgid "Not Issued"
msgstr "Pas en prêt"
@@ -2229,7 +2284,7 @@
msgstr "Pas paru"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:258
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:265
msgid "Not Reserveable"
msgstr "Non réservable"
@@ -2238,8 +2293,8 @@
msgid "Not renewable"
msgstr "Pas renouvelable"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:210
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:36
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:212
msgid "Note"
msgstr "Note"
@@ -2249,9 +2304,9 @@
"Remarque : Votre commentaire sera accepté ou rejeté par un(e) bibliothécaire "
"avant."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:115
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:77
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:19
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:117
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:77
msgid "Notes"
msgstr "Notes"
@@ -2265,10 +2320,10 @@
msgid "Notes/Comments"
msgstr "Notes/commentaires"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:117
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:125
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:119
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:127
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl:28
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:69
msgid "Notes:"
msgstr "Notes :"
@@ -2281,25 +2336,26 @@
msgstr "N° de parution"
#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:49
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:49
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-tags_subject.tmpl:13
msgid "OK"
msgstr "OUI"
#. %1$s: TMPL_VAR name=cardnumber
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:170
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:172
#, c-format
msgid "On issue to %s"
msgstr "En prêt à (%s)"
#. %1$s: TMPL_VAR name=onloancount
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:249
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:256
#, c-format
msgid "On loan (%s),"
msgstr "En prêt (%s),"
#. %1$s: TMPL_VAR name=orderedcount
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:252
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:259
#, c-format
msgid "On order (%s)"
msgstr "En commande (%s)"
@@ -2313,8 +2369,8 @@
msgstr "Commandé par la bibliothèque"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:133
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:169
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:137
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:173
msgid "Owner:"
msgstr "Propriétaire :"
@@ -2330,7 +2386,7 @@
msgid "Papier"
msgstr "Papier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:49
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:46
msgid "Pass:"
msgstr "Mot de passe :"
@@ -2360,7 +2416,7 @@
msgid "Peinture"
msgstr "Peinture"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:59
msgid "Pending"
msgstr "En attente"
@@ -2392,7 +2448,7 @@
msgid "Phone (Home):"
msgstr "Téléphone (domicile) :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:65
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:63
msgid "Phone:"
msgstr "Téléphone :"
@@ -2420,9 +2476,9 @@
msgid "Pierre"
msgstr "Pierre"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:12
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:11
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl:11
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:12
msgid "Place Reserve"
msgstr "Faire une Réservation"
@@ -2481,11 +2537,11 @@
msgid "Pré-scolaire"
msgstr "Pré-scolaire"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:42
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:135
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:172
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:174
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:139
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:176
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:178
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:204
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:43
msgid "Private"
msgstr "Privé"
@@ -2497,16 +2553,16 @@
msgid "Programmed texts"
msgstr "Textes de programmes"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:43
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:203
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:136
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:177
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:179
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:200
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:140
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:181
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:183
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:204
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:44
msgid "Public"
msgstr "Public"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:78
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:80
msgid "Published by :"
msgstr "Publié par :"
@@ -2516,10 +2572,10 @@
msgid "Published by: %s"
msgstr "Publié par : %s"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:18
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:68
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:78
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:80
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:76
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:18
msgid "Publisher"
msgstr "Editeur"
@@ -2536,12 +2592,12 @@
msgid "Purchase Suggestions"
msgstr "Suggestions d'achat"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:38
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:39
#, c-format
msgid "Query the <a1>authorities</a>"
msgstr "Rechercher dans les <a1>autorités</a>"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:28
msgid "Query the catalogue"
msgstr "Chercher dans le catalogue"
@@ -2562,7 +2618,8 @@
msgid "Rapport technique"
msgstr "Rapport technique"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:290
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:293
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:126
msgid "Rating (from Amazon.com):"
msgstr "Classement (de Amazon.com):"
@@ -2594,8 +2651,8 @@
msgid "Reference"
msgstr "Référence"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:135
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc:4
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:135
msgid "Refine Your Search"
msgstr "Affinez votre recherche"
@@ -2611,7 +2668,7 @@
msgid "Related links:"
msgstr "Liens connexes:"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl:65
msgid "Relationship:"
msgstr "Lien :"
@@ -2633,7 +2690,7 @@
msgid "Requested"
msgstr "Demandé"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:172
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:176
msgid "Reservation"
msgstr "Réservation"
@@ -2649,7 +2706,7 @@
msgid "Reserved Items Waiting"
msgstr "Documents réservés en attente"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:261
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:268
msgid "Reserves"
msgstr "Réservation"
@@ -2716,10 +2773,12 @@
msgid "Review"
msgstr "Commentaire"
+#. For the first occurrence,
#. %1$s: TMPL_VAR name=title
#. %2$s: TMPL_VAR name=surname
#. %3$s: TMPL_VAR name=firstname
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:252
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:254
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:87
#, c-format
msgid "Review by %s %s %s"
msgstr "Commentaire de %s %s %s"
@@ -2735,7 +2794,8 @@
msgid "Reviews"
msgstr "Commentaires"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:248
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:250
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:83
msgid "Reviews by members:"
msgstr "Commentaires des lecteurs :"
@@ -2752,7 +2812,7 @@
msgstr "Samedi"
#. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:191
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:195
msgid "Save Changes"
msgstr "Enregistrer les modifications"
@@ -2766,9 +2826,9 @@
msgid "Scan Index:"
msgstr "Parcourir l'index :"
-#. INPUT type=submit name=do
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:435
+#. INPUT type=submit
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:435
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl:35
msgid "Search"
msgstr "Rechercher"
@@ -2832,7 +2892,7 @@
msgid "Sending your book bag"
msgstr "Envoyer votre panier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:132
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:134
msgid "Serial"
msgstr "Périodique"
@@ -2855,7 +2915,7 @@
msgid "Set Filter"
msgstr "Sélectionner"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:51
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:59
msgid "Set language to"
msgstr "Changer langue pour"
@@ -2864,15 +2924,15 @@
msgstr "Sexe :"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:149
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:198
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:153
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:202
msgid "Shelf Name"
msgstr "Nom de l'étagère"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:36
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:132
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:168
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:136
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:172
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:37
msgid "Shelf Name:"
msgstr "Nom de l'étagère :"
@@ -2881,8 +2941,8 @@
msgid "Show"
msgstr "Montrer"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:150
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc:12
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:150
msgid "Show More"
msgstr "En voir plus"
@@ -2896,7 +2956,7 @@
msgid "Showing Last 50 Items | <a1>Show All Items</a>"
msgstr "Seulement les 50 derniers documents| <a1>Montrer tout </a>"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:88
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:90
msgid "Size:"
msgstr "Taille :"
@@ -2910,7 +2970,8 @@
msgid "Sorry, the system doesn't think you have permission to access this page."
msgstr "Désolé, Koha pense que vous n'avez pas les droits pour accéder à cette page."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:306
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:309
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:142
msgid "Sorry, there are no reviews available for this title."
msgstr "Désolé, il n'y a pas de commentaire disponible pour ce titre."
@@ -2948,8 +3009,8 @@
msgstr "Numéro normalisé"
#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:63
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-dictionary.tmpl:11
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:59
msgid "Start search"
msgstr "Rechercher"
@@ -2957,11 +3018,11 @@
msgid "Statistics"
msgstr "Statistiques"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:47
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:160
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:209
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:31
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:162
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:211
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:49
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:165
msgid "Status"
msgstr "Situation"
@@ -2993,17 +3054,17 @@
msgid "Subject: %s"
msgstr "Sujet : %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:98
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:100
msgid "Subjects"
msgstr "Sujets"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:105
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:107
msgid "Subjects:"
msgstr "Sujets :"
#. INPUT type=submit
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl:30
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:33
msgid "Submit Changes"
msgstr "Proposer les modifications à la bibliothèque"
@@ -3020,7 +3081,7 @@
msgid "Subscription information for %s"
msgstr "Détails de l'abonnement pour %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:51
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:53
msgid "Subtitle(s):"
msgstr "Sous-titre(s) :"
@@ -3107,7 +3168,7 @@
msgid "The book bag was sent to: %s"
msgstr "Le panier a été envoyé à : %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:204
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:206
msgid "The three latest issues related to this subscription:"
msgstr "Les trois derniers numéros de cet(s) abonnement(s)"
@@ -3115,7 +3176,7 @@
msgid "Theatre, piece televisee"
msgstr "Théâtre, pièce télévisée"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:102
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl:103
msgid "There are no pending purchase suggestions"
msgstr "Il n'y a pas de suggestions d'achat en attente"
@@ -3135,21 +3196,21 @@
"Cet \"nuage\" vous montre les sujets les plus utilisés dans notre catalogue. "
"Cliquez sur l'un d'entre eux pour voir les documents qui y sont attachés."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:199
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:201
msgid "This is a serial subscription"
msgstr "Il s'agit d'un abonnement"
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "This item has been added to your book bag"
msgstr "Ce document a été ajouté à votre panier"
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "This item is already in your book bag"
msgstr "Ce document est déjà dans votre panier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:69
msgid "This shelf is empty."
msgstr "Cette étagère est vide."
@@ -3161,15 +3222,16 @@
msgid "Tirage photographique"
msgstr "Tirage photographique"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:77
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:68
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:80
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl:18
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:70
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:169
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:32
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:71
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:108
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl:162
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-topissues.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:173
msgid "Title"
msgstr "Titre"
@@ -3293,7 +3355,7 @@
msgid "Type/Format"
msgstr "Type/Support"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:156
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:158
msgid "URL"
msgstr "URL"
@@ -3303,11 +3365,11 @@
msgid "URL : %s"
msgstr "URL : %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:138
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:140
msgid "URL:"
msgstr "URL :"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:126
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:128
msgid "Unified title"
msgstr "Titre uniforme"
@@ -3329,7 +3391,7 @@
msgid "Used in"
msgstr "Utilisé dans"
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:36
msgid "User Info"
msgstr "Info utilisateur"
@@ -3348,6 +3410,11 @@
msgid "VHS tape / Videocassette"
msgstr "Vidéocassette /VHS"
+#. LINK
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:4
+msgid "VNUNet.fr - Actualités"
+msgstr ""
+
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:385
msgid "Verre"
msgstr "Verre"
@@ -3356,8 +3423,8 @@
msgid "View Full Heading"
msgstr "Voir la vedette en entier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:195
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc:27
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:199
msgid "Virtual Shelves"
msgstr "Etagères virtuelles"
@@ -3366,12 +3433,12 @@
msgid "Visual Materials"
msgstr "Documents visuels"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:162
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:164
msgid "Volume"
msgstr "Volume"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:220
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl:46
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:222
msgid "Waited"
msgstr "Attendu"
@@ -3386,7 +3453,7 @@
msgstr "En attente à %s"
#. %1$s: TMPL_VAR name=subscriptionsnumber
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:38
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:40
#, c-format
msgid "We have %s subscription(s) associated with this title."
msgstr "Nous avons %s abonnement(s) associé(s) à ce titre."
@@ -3406,26 +3473,27 @@
msgid "Welcome %s %s"
msgstr "Bonjour %s %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:79
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:80
msgid "With selected items :"
msgstr "Avec les éléments cochés"
#. %1$s: TMPL_VAR name=wthdrawncount
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:250
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:257
#, c-format
msgid "Withdrawn (%s),"
msgstr "Retiré (%s),"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:23
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl:28
msgid "Work/Fax phone"
msgstr "N° de téléphone/fax bureau"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:271
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:274
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl:107
msgid "Write or modify your reviews on this biblio."
msgstr "Ecrivez ou modifiez votre commentaire sur cet ouvrage."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:114
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:116
msgid "Year :"
msgstr "Année :"
@@ -3444,7 +3512,7 @@
"reconnecter."
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "You book bag is currently empty"
msgstr "Votre panier est actuellement vide"
@@ -3502,8 +3570,8 @@
msgid "Your Account"
msgstr "Votre compte"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:13
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl:2
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl:13
msgid "Your Book Bag"
msgstr "Votre panier"
@@ -3575,11 +3643,11 @@
#
#. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:37
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:40
msgid "already in the bag"
msgstr "Déjà dans le panier"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:190
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:194
msgid "any"
msgstr "tout"
@@ -3613,7 +3681,7 @@
msgid "by %s"
msgstr "par %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:188
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:192
msgid "by you."
msgstr "par vous."
@@ -3625,21 +3693,25 @@
msgid "cartes marines"
msgstr "Cartes marines"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:132
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:134
msgid "classification:"
msgstr "classification:"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:50
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl:52
msgid "close this window."
msgstr "Fermer la fenêtre"
#
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:27
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:38
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:49
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:39
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:51
msgid "contains"
msgstr "contient"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:83
+msgid "copyright"
+msgstr "copyright"
+
#. INPUT type=checkbox name=limit
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:416
msgid "datedue:0000-00-00"
@@ -3654,8 +3726,8 @@
msgstr "documents"
#. META http-equiv=Content-Language
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc:4
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc:3
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc:4
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc:3
msgid "en-us"
msgstr "Anglais-us"
@@ -3668,7 +3740,7 @@
msgid "enfant"
msgstr "Enfant"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:189
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:193
msgid "everybody"
msgstr "tout le monde"
@@ -3692,18 +3764,18 @@
msgid "formes variées ou autres formes litteraires"
msgstr "formes variées ou autres formes littéraires"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:140
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:190
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:144
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:194
msgid "free"
msgstr "libre"
#. IMG
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:185
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl:192
msgid "image"
msgstr "image"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:85
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl:32
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:87
msgid "in"
msgstr "En :"
@@ -3721,6 +3793,12 @@
msgid "index"
msgstr "Index"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:41
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:53
+msgid "is exactly"
+msgstr "est exactement"
+
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:210
msgid "jeune adulte"
msgstr "Jeune adulte"
@@ -3809,7 +3887,7 @@
msgid "on"
msgstr "le"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:188
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:192
msgid "only"
msgstr "seulement"
@@ -3823,16 +3901,20 @@
msgid "plans"
msgstr "Plans"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:139
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:188
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:143
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:192
msgid "private"
msgstr "privé"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:139
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:189
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:143
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:193
msgid "public"
msgstr "public"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl:86
+msgid "publication year"
+msgstr "Année d'édition"
+
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc:13
msgid "purchase suggestions"
msgstr "suggestions d'achat"
@@ -3842,7 +3924,7 @@
msgstr "trimestre"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:82
msgid "remove"
msgstr "retirer"
@@ -3867,9 +3949,9 @@
msgstr "depuis %s mois"
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:28
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:39
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:50
-msgid "start by"
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:40
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl:52
+msgid "starts by"
msgstr "commence par"
#: ../../koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl:292
@@ -3882,10 +3964,10 @@
msgstr "text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->"
#. META http-equiv=Content-Type
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc:2
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc:2
-#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc:2
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc:2
#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc:2
+#: ../../koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc:2
msgid "text/html; charset=utf-8"
msgstr "text/html; charset=utf-8"
@@ -3911,46 +3993,46 @@
msgid "up to %S subjects"
msgstr "jusqu'Ã %S sujets"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:190
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:194
msgid "user."
msgstr "utilisateur."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:140
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:144
msgid "virtual shelf can be added to and changed by any user."
msgstr "étagère virtuelle peut être gérée par tout le monde."
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:190
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:194
msgid "virtual shelf can be added to or changed by"
msgstr "étagère virtuelle peut-être gérée par"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:189
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:193
msgid "virtual shelf can be seen by"
msgstr "étagère virtuelle peut être vue par"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:139
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:143
msgid "virtual shelf can be seen by everybody, but managed only by you."
msgstr ""
"étagère virtuelle peut être gérée par vous seul mais êtrevue par tout le "
"monde."
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:188
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:192
msgid "virtual shelf is managed by you and can be seen"
msgstr "étagère virtuelle est gérée par vous seul, et peut être vue"
#
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:139
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl:143
msgid "virtual shelf is managed by you and can be seen only by you."
msgstr "étagère virtuelle est gérée et être vue par vous seul."
#. %1$s: TMPL_VAR name=volume
#. %2$s: TMPL_VAR name=volumedate
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:100
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:102
#, c-format
msgid "vol. %s %s"
msgstr "vol. %s, %s"
-#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:195
+#: ../../koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl:197
msgid "we don't have any physical item for this document"
msgstr "nous n'avons aucun exemplaire physique de ce document"
Index: misc/zebra/record_authorities_unimarc.abs
===================================================================
RCS file: /sources/koha/koha/misc/zebra/record_authorities_unimarc.abs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/zebra/record_authorities_unimarc.abs 9 Mar 2007 15:47:25 -0000 1.2
+++ misc/zebra/record_authorities_unimarc.abs 22 May 2007 09:13:59 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: record_authorities_unimarc.abs,v 1.2 2007/03/09 15:47:25 tipaul Exp $
+# $Id: record_authorities_unimarc.abs,v 1.3 2007/05/22 09:13:59 tipaul Exp $
# indexing rules. It
# results in a server which provides a passable Bath level 0 and 1 service
@@ -54,6 +54,7 @@
melm 220$a Heading,Heading-Entity,Heading:s,personal-heading
melm 230$a Heading,Heading-Entity,Heading:s,Title-Uniform
melm 235$a Heading,Heading-Entity,Heading:s,Title-Uniform
+melm 240$a Heading,Heading-Entity,Heading:s,Name-Title
melm 250$a Heading,Heading-Entity,Heading:s,Subject-heading, Subject-heading:s
melm 200 Heading-Entity,Heading-Entity:s, personal-Heading-Entity
@@ -64,6 +65,7 @@
melm 220 Heading-Entity,Heading-Entity:s,personal-Heading-Entity
melm 230 Heading-Entity,Heading-Entity:s,Title-Uniform-entity
melm 235 Heading-Entity,Heading-Entity:s,Title-Uniform-entity
+melm 240 Heading-Entity,Heading-Entity:s,Name-Title-entity
melm 250 Heading-Entity,Subject-Thesaurus
#210 Heading - Corporate Body Name
@@ -97,6 +99,7 @@
melm 440 See-Entity, personal-See-Entity
melm 430 See-Entity, Title-Uniform-See-Entity
melm 435 See-Entity, Title-Uniform-See-Entity
+melm 435 See-Entity, Name-Title-See-Entity
melm 450 See-Entity,Subject-See-Entity
#410 Heading - Corporate Body Name
@@ -121,6 +124,7 @@
melm 540$a personal-see-also,personal-see-also:w,personal-see-also:s,personal-see-also:p
melm 530$a Title-Uniform-see-also,Title-Uniform-see-also:w,Title-Uniform-see-also:s,Title-Uniform-see-also:p
melm 535$a Title-Uniform-see-also,Title-Uniform-see-also:w,Title-Uniform-see-also:s,Title-Uniform-see-also:p
+melm 540$a Name-Title-see-also,Name-Title-see-also:w,Name-Title-see-also:s,Name-Title-see-also:p
melm 550$a Subject-see-also,Subject-see-also:w,Subject-see-also:s,Subject-see-also:p
#510 Heading - Corporate Body Name
#515 Heading - Territorial or Geographical Name
@@ -144,6 +148,7 @@
melm 770$a personal-parallel,personal-parallel:w,personal-parallel:s,personal-parallel:p
melm 730$a Title-Uniform-parallel,Title-Uniform-parallel:w,Title-Uniform-parallel:s,Title-Uniform-parallel:p
melm 735$a Title-Uniform-parallel,Title-Uniform-parallel:w,Title-Uniform-parallel:s,Title-Uniform-parallel:p
+melm 740$a Name-Title-parallel,Name-Title-parallel:w,Name-Title-parallel:s,Name-Title-parallel:p
melm 750$a Subject-parallel,Subject-parallel:w,Subject-parallel:s,Subject-parallel:p
########## NOTES #################
Index: opac/changelanguage.pl
===================================================================
RCS file: /sources/koha/koha/opac/changelanguage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- opac/changelanguage.pl 9 Mar 2007 15:12:54 -0000 1.2
+++ opac/changelanguage.pl 22 May 2007 09:14:00 -0000 1.3
@@ -22,4 +22,5 @@
my $language = $query->param('language');
my $url = $query->referer();
+warn "Language : $query // $language // $url";
setlanguagecookie( $query, $language, $url );
Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- opac/opac-main.pl 24 Apr 2007 13:54:29 -0000 1.27
+++ opac/opac-main.pl 22 May 2007 09:14:00 -0000 1.28
@@ -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-main.pl,v 1.27 2007/04/24 13:54:29 hdl Exp $
+# $Id: opac-main.pl,v 1.28 2007/05/22 09:14:00 tipaul Exp $
use strict;
require Exporter;
@@ -62,7 +62,7 @@
if($limit) {
my $recentacquiloop = GetRecentAcqui($limit);
- warn Data::Dumper::Dumper($recentacquiloop);
+# warn Data::Dumper::Dumper($recentacquiloop);
$template->param(
recentacquiloop => $recentacquiloop,
);
Index: serials/member-search.pl
===================================================================
RCS file: /sources/koha/koha/serials/member-search.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- serials/member-search.pl 24 Apr 2007 15:41:27 -0000 1.6
+++ serials/member-search.pl 22 May 2007 09:14:00 -0000 1.7
@@ -43,7 +43,7 @@
);
if ($searchstring) {
- my ( $count, $members ) = &SearchMember( '', $searchstring, "surname" );
+ my ( $count, $members ) = &SearchMember( $searchstring, "surname" );
$template->param(
subscriptionid => $subscriptionid,
Index: koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
diff -N koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css 22 May 2007 09:13:57 -0000 1.1
@@ -0,0 +1,515 @@
+body {
+ font-family : Verdana, Geneva, Arial, sans-serif;
+ font-size : .9em;
+ color:#494949;
+ background: url( /intranet-tmpl/prog/images/css_header.png );
+ background-repeat:repeat-x;
+ background-color:#EDF5FA;
+}
+
+h1 {
+ margin:0px;
+}
+h2 {
+ display:block;
+ clear:left;
+ margin:0px 0px 10px 10px;
+}
+
+h3 {
+ display:block;
+ clear:left;
+ margin:0px 0px 0px 10px;
+}
+
+table {
+ border-collapse : inherit;
+ border : 1px solid #CCCCCC;
+ margin : 1em 0 1em 20px;
+ border-collapse:collapse;
+}
+
+caption {
+ font-size : 140%;
+ text-align : left;
+ font-weight : bold;
+}
+
+td,th {
+ /*border-left : 1px solid #CCCCCC;
+ border-bottom : 1px solid #CCCCCC;*/
+ border : 1px solid #CCCCCC;
+ padding : 5px;
+}
+
+th {
+ background-color : #CCCCCC;
+ border-left : 1px solid #999999;
+ border-bottom : 1px solid #999999;
+}
+
+th[scope=row] {
+ background-color : #EEEEEE;
+ text-align : right;
+}
+
+p {
+ margin:0px 0px 0px 20px;
+}
+input {
+ font-size:0.9em;
+}
+
+select {
+ font-size:0.9em;
+}
+
+fieldset {
+ border : 1px solid #bbb;
+ display: inline;
+ vertical-align: top;
+}
+
+input[type=submit], input[type=button], input[type=reset] {
+ border:0px;
+ color: #0072b9;
+ font-weight:bold;
+ background: url( /intranet-tmpl/prog/images/bg-tab.png );
+ font-size : 0.8em;
+ padding:3px;
+ text-decoration:none;
+ display:inline;
+ cursor:pointer;
+ margin-left:20px;
+}
+
+label {
+ font-style:italic;
+ vertical-align:top;
+ display:block;
+ float:left;
+/* text-align:right; */
+ width:10em;
+ margin-right:0.2em;
+}
+
+p {
+clear:left;
+}
+
+a {
+ text-decoration:none;
+ color:#027ac6;
+}
+a:hover {
+ text-decoration:underline;
+ color:#0072b9;
+}
+.searchresults table tr:hover{
+ background-color: #CCFFFF;
+}
+
+tr.highlight td, tr.highlight th {
+ background-color : #EEEEEE;
+}
+
+.here {
+ color: black;
+ text-decoration:none;
+}
+
+#problem {
+ color: red;
+ background-color:white;
+ font-weight : bold;
+ margin:10px;
+}
+
+#admin_stopwords_select UL {
+ width: 600px;
+}
+
+#admin_stopwords_select UL LI {
+ white-space: nowrap;
+}
+
+legend {
+ font-size:120%;
+ font-weight:bold;
+}
+
+.problem {
+ color: white;
+ background-color:red;
+ font-weight : bold;
+ margin:10px;
+}
+
+/* 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;
+}
+
+.hasexpirated {
+ text-decoration: line-through;
+}
+
+/* style for search terms in catalogsearch */
+.term {
+ background-color:yellow;
+}
+
+/* end of css styles for reserves color alerts */
+
+/* the Koha logo (top left) */
+#kohalogo {
+ position:fixed;
+ left:20px;
+ top:20px;
+}
+/* MAIN MENU STYLES */
+#mainmenu {
+ display:block;
+ position:fixed;
+ font-weight : normal;
+ margin-top:20px;
+ margin-right: 5px;
+ padding-right: 5px;
+ font-size:0.9em;
+}
+
+#mainmenu a {
+ display:block;
+ margin-bottom:0px;
+ padding-left :5px;
+ text-decoration:none;
+ font-weight:bold;
+ color:#027ac6;
+}
+
+
+#mainmenu a:hover {
+ display:block;
+ margin-bottom:0px;
+ padding-left :5px;
+ text-decoration:none;
+ font-weight:bold;
+ background-color:#027ac6;
+ color:white;
+}
+
+#mainmenu ul a {
+ display:block;
+ margin-bottom:5px;
+ padding-left :5px;
+ text-decoration:none;
+ font-weight:normal;
+ color:#027ac6;
+}
+
+#mainmenu ul a:hover {
+ display:block;
+ margin-bottom:5px;
+ padding-left :5px;
+ text-decoration:none;
+ font-weight:normal;
+ background-color:#027ac6;
+ color:white;
+}
+
+#mainmenu ul {
+ list-style-type: none;
+ padding-left:20px;
+ margin-bottom:0px;
+ margin-top:0px;
+ color:#027ac6;
+}
+
+#mainmenu li {
+ list-style-type: none;
+ padding-left:0px;
+ margin-left:0px;
+ margin-bottom:0px;
+ margin-top:0px;
+ color:#027ac6;
+}
+
+#mainmenu label {
+ width:4em;
+}
+
+#mainmenu h3 {
+ color:white;
+ font-size:1.2em;
+ margin:10px 0px 10px 0px ;
+}
+
+#mainmenu input {
+ border:0px;
+ border-bottom:1px solid #027ac6;
+}
+#mainmenu input[type=submit], input[type=button], input[type=reset] {
+ margin-left:0px;
+ border-bottom:0px;
+}
+
+
+/* submenus styles */
+#submenu {
+ position:absolute;
+ top:10px;
+ left:220px;
+}
+
+#submenu a {
+ margin:5px;
+ text-decoration:none;
+ color:white;
+}
+
+#submenu a:hover {
+ margin:5px;
+ background-color:white;
+ color:#027ac6;
+}
+
+/*Action button*/
+#action {
+ float:right;
+}
+
+#action a {
+ color: #0072b9;
+ font-weight:bold;
+ background: url( /intranet-tmpl/prog/images/bg-tab.png );
+ font-size : 0.8em;
+ padding:3px;
+ margin-bottom:2px;
+ text-decoration:none;
+ display:block;
+}
+
+/*edit action*/
+#action .edit {
+ display:inline;
+ margin-bottom:10px;
+}
+
+#action .edit a {
+ background:none;
+ background-color : #0072b9;
+ color : white;
+}
+
+#action .edit a:hover {
+ cursor:pointer;
+}
+
+#action .view {
+ display:inline;
+ margin-bottom:5px;
+}
+
+#action .view a {
+ background:none;
+ background-color : #5ab5ee;
+ color : white;
+ margin-top: 1px;
+}
+
+#action .view a:hover {
+ cursor:pointer;
+}
+
+#action .others {
+ display:inline;
+ margin-bottom:5px;
+}
+
+#action .others a {
+ background:none;
+ background-color : #2385C2;
+ color : white;
+ margin-top: 1px;
+}
+
+#action .others a:hover {
+ cursor:pointer;
+}
+
+/* Main body style */
+#main {
+ margin-left:220px;
+ margin-top:75px;
+ padding:5px;
+ padding-bottom:100px;
+ background-color:white;
+ border:1px solid #bbb;
+}
+
+/* facets bloc */
+#facets {
+ position:absolute;
+ right:1em;
+}
+
+#facets dl {
+ background-color:white;
+ margin:0px;
+}
+
+#facets dt {
+ text-align:right;
+ font-weight:bold;
+}
+
+#facets dd {
+ border:1px solid #CCCCCC;
+}
+
+/* the USER information block */
+#librarian_information {
+/* position:absolute; */
+ float:right;
+ font-size:10pt;
+}
+
+/* css style for reregistration alert */
+
+.reregistrinfo {
+ color: #6699cc;
+ font-weight : bold;
+ background-color : #eeeeee;
+}
+/* MARC editor */
+
+/* styles for the 11 buttons that the user can click on */
+/* the design of the active tab button (only 1 at a given time)*/
+.tab_active {
+ color: #6699CC;
+ background-color : #CCCCCC;
+ font-size : 1em;
+ border: 2px inset;
+ font-weight : bold;
+ text-decoration:none;
+ display: inline;
+ text-decoration:none;
+ margin-left:10px;
+}
+
+#onlinehelp {
+ position:absolute;
+ top:0px;
+ right:10px;
+}
+
+/* the design of the INactives tab buttons (all other tabs) */
+.tab_inactive {
+ background-color : #6699CC;
+ color : #FFFFFF;
+ font-size : 1em;
+ font-weight : bold;
+ display:inline;
+ border: 2px outset;
+ text-decoration:none;
+ margin-left:10px;
+}
+
+/* the button of INactive tabs : we need this one to have white color on links, otherwise, default a look will be choosen */
+#tabs a {
+ color:white;
+ text-decoration:none;
+ padding-right:10px;
+ padding-left:10px;
+}
+
+/* specify that we to do when the mouse is on 1 button */
+#tabs a:hover {
+ border: 2px inset;
+}
+
+#tabs {
+ margin-top:45px;
+ margin-bottom:5px;
+}
+
+/* styles for the 11 content blocks */
+/* the property for hidden tabs */
+.content_hidden {
+ visibility:hidden; /* you propably don't need to change this one */
+ display:none;
+}
+
+/* the property for the displayed tab */
+.content_visible {
+ visibility:visible; /* you propably don't need to change this one */
+ display:block;
+}
+
+/* the style of tag description */
+p.tag {
+ font-weight:bold;
+}
+/* the style of subfield paragraph */
+p.subfield {
+
+}
+
+
+
+.lineSelected {
+ background-color:yellow;
+}
+
+
+/* display more informations with css layer */
+a.info {
+ position: relative;
+ text-decoration: none;
+ color: black;
+ border-bottom: 1px gray dotted;
+}
+
+a.info span {
+ display: none;
+ width:300px;
+}
+
+a.info:hover {
+ background: none; /* correcting IE bug*/
+ z-index: 500;
+}
+a.info:hover span {
+ display: inline;
+ position: absolute;
+ top: 2em;
+ right: 1em;
+ background: orange;
+ text-align: center;
+ color: white;
+ padding: 2px;
+}
Index: koha-tmpl/intranet-tmpl/prog/images/bg-tab.png
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/images/bg-tab.png
diff -N koha-tmpl/intranet-tmpl/prog/images/bg-tab.png
Binary files /dev/null and /tmp/cvsojbWmu differ
Index: koha-tmpl/intranet-tmpl/prog/images/css_header.png
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/images/css_header.png
diff -N koha-tmpl/intranet-tmpl/prog/images/css_header.png
Binary files /dev/null and /tmp/cvsJSRHxu differ
Index: koha-tmpl/intranet-tmpl/prog/images/koha-logo.png
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/images/koha-logo.png
diff -N koha-tmpl/intranet-tmpl/prog/images/koha-logo.png
Binary files /dev/null and /tmp/cvsiYjb5u differ
More information about the Koha-cvs
mailing list