From 5ff7fcffa4b1e34c06cdb171503516b11c2350d4 Mon Sep 17 00:00:00 2001
From: tipaul
Date: Tue, 22 May 2007 09:13:54 +0000
Subject: [PATCH] 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
---
C4/Biblio.pm | 10 +-
C4/Circulation.pm | 6 +-
C4/Context.pm | 9 +-
C4/Stats.pm | 2 +-
circ/pendingreserves.pl | 1 -
circ/transferstodo.pl | 13 +-
circ/transferstoreceive.pl | 12 +-
.../prog/en/acqui/acqui-home.tmpl | 22 +-
.../prog/en/acqui/neworderempty.tmpl | 6 +-
.../prog/en/admin/biblio_framework.tmpl | 2 +-
.../prog/en/admin/categoryitem.tmpl | 4 +-
.../prog/en/admin/itemtypes.tmpl | 10 +-
.../prog/en/admin/systempreferences.tmpl | 8 +-
koha-tmpl/intranet-tmpl/prog/en/auth.tmpl | 4 +-
.../en/authorities/searchresultlist-auth.tmpl | 8 +-
.../prog/en/barcodes/label-edit-template.tmpl | 8 +-
.../prog/en/barcodes/label-home.tmpl | 221 ++---
.../prog/en/catalogue/detail.tmpl | 2 +-
.../prog/en/catalogue/results.tmpl | 113 ++-
.../prog/en/circ/branchtransfers.tmpl | 2 +-
.../prog/en/circ/circulation.tmpl | 33 +-
.../intranet-tmpl/prog/en/circ/returns.tmpl | 70 +-
.../prog/en/circ/transferstodo.tmpl | 103 ++-
.../prog/en/circ/transferstoreceive.tmpl | 115 +--
.../prog/en/circ/waitingreserves.tmpl | 4 +-
.../prog/en/includes/doc-head-close.inc | 4 +-
.../prog/en/includes/intranet.css | 36 +-
.../prog/en/includes/intranet2.css | 515 +++++++++++
.../prog/en/includes/menu-catalogue.inc | 4 +-
.../intranet-tmpl/prog/en/includes/menus.inc | 13 +-
.../prog/en/installer/step1.tmpl | 2 +-
.../intranet-tmpl/prog/en/members/member.tmpl | 10 +-
.../prog/en/members/memberentryI.tmpl | 860 +++++++++---------
.../prog/en/members/readingrec.tmpl | 43 +-
.../prog/en/reserve/request.tmpl | 308 +++----
.../intranet-tmpl/prog/en/serials/claims.tmpl | 2 +-
.../prog/en/serials/serials-edit.tmpl | 4 +-
.../prog/en/serials/subscription-add.tmpl | 48 +-
.../prog/en/serials/subscription-detail.tmpl | 214 +++--
.../intranet-tmpl/prog/images/bg-tab.png | Bin 0 -> 115 bytes
.../intranet-tmpl/prog/images/css_header.png | Bin 0 -> 897 bytes
.../intranet-tmpl/prog/images/koha-logo.png | Bin 0 -> 4118 bytes
.../prog/en/includes/doc-head-close.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/includes/opac.css | 29 +-
koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl | 2 +
koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl | 11 +-
misc/cronjobs/zebraqueue_start.pl | 2 +-
.../22_to_30/rebuild_unimarc_100.pl | 13 +-
misc/migration_tools/rebuild_zebra.pl | 18 +-
misc/translator/po/prog_opac_fr.po | 644 +++++++------
misc/zebra/record_authorities_unimarc.abs | 5 +
opac/changelanguage.pl | 1 +
opac/opac-main.pl | 2 +-
serials/member-search.pl | 2 +-
54 files changed, 2113 insertions(+), 1469 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
create mode 100644 koha-tmpl/intranet-tmpl/prog/images/bg-tab.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/images/css_header.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/images/koha-logo.png
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 20c1507111..e86dd24c8d 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -437,7 +437,7 @@ sub ModItemTransfer {
#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(
@@ -3920,6 +3920,14 @@ Joshua Ferraro jmf@liblime.com
# $Id$
# $Log$
+# 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
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index a4e22a9629..e6cd4a5b00 100755
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1193,7 +1193,7 @@ sub AddReturn {
# 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 @@ sub AddReturn {
$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 @@ sub AddReturn {
# 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;
diff --git a/C4/Context.pm b/C4/Context.pm
index d1b1bac07b..65f07596b9 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -475,7 +475,6 @@ sub _new_Zconn {
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 @@ Joshua Ferraro
=cut
# $Log$
+# 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
#
diff --git a/C4/Stats.pm b/C4/Stats.pm
index 0ff9059fea..3f9a1785b2 100644
--- a/C4/Stats.pm
+++ b/C4/Stats.pm
@@ -80,7 +80,7 @@ sub UpdateStats {
# 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,
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 753b699ad8..4952afa052 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -25,7 +25,6 @@ use C4::Output;
use CGI;
use C4::Auth;
use C4::Date;
-use C4::Interface::CGI::Output;
my $input = new CGI;
my $order = $input->param('order');
diff --git a/circ/transferstodo.pl b/circ/transferstodo.pl
index ba6b80aa18..23a58df5b4 100755
--- a/circ/transferstodo.pl
+++ b/circ/transferstodo.pl
@@ -75,11 +75,11 @@ my @branchesloop;
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 @@ foreach my $br ( keys %$branches ) {
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(
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 9289eb0f5e..dd31ead0e0 100644
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -70,12 +70,12 @@ my @branchesloop;
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 @@ foreach my $br ( keys %$branches ) {
# 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(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
index 74fc2de8d9..250010b153 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
@@ -66,12 +66,13 @@
-
Budgets and Funds
[ Manage ]
-
+
+
+
Budgets
Total
@@ -79,6 +80,8 @@
Comtd
Avail
+
+
@@ -88,16 +91,19 @@
+
+
- Total
-
-
-
-
+ Total
+
+
+
+
+
+
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
index ce95c3813e..dbf731333c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
@@ -125,11 +125,11 @@ Item Types Administration
Not for loan
-
- checked="checked"
-
- 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)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
index 6b59a5dfea..f2a13a74a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
@@ -77,7 +77,7 @@
Variable ">
Variable
Value
-
+
@@ -85,7 +85,11 @@
- "selected="selected">
+
+ " selected="selected">
+
+ ">
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
index 19d96ec9f3..7dfe6deb90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
@@ -7,8 +7,8 @@
Log in to Koha
-
-
+
+
Log in to Koha
Login Error
Sorry, Koha doesn"t think you have permission for this page.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
index c500525922..bf0ec302da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
@@ -63,7 +63,7 @@
&&authtypecode=&=&op=do_search&type=intranet&index=&tagid=">
- <<
+ <<
@@ -76,7 +76,7 @@
&&authtypecode=&=&op=do_search&type=intranet&index=&tagid=">
- >>
+ >>
@@ -118,7 +118,7 @@
&&authtypecode=&=&op=do_search&type=intranet&index=&tagid=">
- <<
+ <<
@@ -131,7 +131,7 @@
&&authtypecode=&=&op=do_search&type=intranet&index=&tagid=">
- >>
+ >>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
index 410f8bddb3..abab686492 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/barcodes/label-edit-template.tmpl
@@ -48,9 +48,11 @@ Template Description:
-
+
-
+
- class="onissue">
- ">
-
- class="onissue">
-
-
- class="onissue">
- class="onissue">Checked Out
+
+
+
+
+
+ ">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Checked Out
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
index 3d20a94587..e03b8eaa35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
@@ -61,43 +61,30 @@ if (alreadyreserved > "0"){
-Request for reserve
+Reserves
-
- Biblio informations
-
+ Biblio informations
Title: ">
Author:
-
-
+Add reserve
-" method="post" onSubmit="request.pl" name="getborrower">
-
- Member search
-
-
- Member (number or name)
-
-
-
- ">
-
-
-
-
-
- ">
-
-
-
-
-
-
+ " method="post" onSubmit="request.pl" name="getborrower">
+
+
+ Member
+ (type card number or part of a name)
+
+ ">
+
+
+
+ ">
+
+
+
-
-
Too many reserves
Currently, this member has too much active reserves.
@@ -129,150 +116,132 @@ if (alreadyreserved > "0"){
Carrefull,there is no borrower with this name, Please, try an other
-
-
-
-
- Reservation properties
-
- ">
- ">
-
- ">
- ">
- Member
-
-
- (card number: )
-
- Not defined yet
+
Reserve properties
+
+
+ ">
+ ">
+
+ ">
+ ">
+ Member
+
+
+ (card number: )
+
+ Not defined yet
+
+
+
+ Priority
+
+
+
+ Notes
+
+
+
+ Pickup at
+
+
+
+ Item type:
+ Publication year:
+
+
+
+
+
+ If no item is available, reserve next returning item
+
+
+
+ ">
+ ">
+
+
+
+
+
+
+
+
+Existing reserves
" action="modrequest.pl" method="post">
-
- Queue list
-
Priority
@@ -352,7 +321,6 @@ if (alreadyreserved > "0"){
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
index 569810b96d..fa81273d20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
@@ -134,7 +134,7 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
Email:
- A/C:
Dear
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
index 006678e4f0..21e102d2b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl
@@ -6,11 +6,10 @@
-Serial Edition:
+Serial Edition
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index 958d4656c6..2f6fb64a83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@ -660,9 +660,9 @@ function check_input(e){
-
-
Subscription information for subscription #
-