From 9b2028ab726b7377684820ae318c909161792054 Mon Sep 17 00:00:00 2001 From: tipaul Date: Tue, 11 Mar 2003 15:13:18 +0000 Subject: [PATCH] some fixes, and links to themelang/images --- circ/branchtransfers.pl | 7 +------ circ/circulation.pl | 4 +--- circ/returns.pl | 7 +------ .../default/en/circ/branchtransfers.tmpl | 18 +++++++++--------- .../default/en/circ/circulation.tmpl | 10 ++++++---- .../intranet-tmpl/default/en/circ/returns.tmpl | 18 +++++++++--------- 6 files changed, 27 insertions(+), 37 deletions(-) diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index 93f8834d4b..447e8b8353 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -30,17 +30,14 @@ use C4::Reserves2; use C4::Auth; use C4::Interface::CGI::Output; use HTML::Template; +use C4::Koha; ############################################### # constants my %env; -my $headerbackgroundcolor='#99cc33'; -my $circbackgroundcolor='#ffffcc'; -my $circbackgroundcolor='white'; my $linecolor1='#ffffcc'; my $linecolor2='white'; -my $backgroundimage="/images/background-mem.gif"; my $branches = getbranches(); my $printers = getprinters(\%env); @@ -258,8 +255,6 @@ $template->param( genbrname => $genbrname, branch => $branch, printer => $printer, found => $found, - hdrbckgdcolor => $headerbackgroundcolor, - bckgdimg => $backgroundimage, reserved => $reserved, waiting => $waiting, name => $name, diff --git a/circ/circulation.pl b/circ/circulation.pl index 96ec103da2..01e0d8d1ee 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -324,7 +324,7 @@ $template->param( responseform => $responsesform, rejected => $rejected, message => $message, - CGIseleborrower => $CGIselectborrower, + CGIselectborrower => $CGIselectborrower, patrontable => $patrontable, flaginfotable => $flaginfotable, @@ -454,7 +454,6 @@ sub printslip { foreach (sort {$a <=> $b} keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; my $dd=$issues[$i]->{'date_due'}; -# warn $_,$dd; #convert to nz style dates #this should be set with some kinda config variable my @tempdate=split(/-/,$dd); @@ -464,7 +463,6 @@ sub printslip { foreach (sort {$a <=> $b} keys %$borroweriss2) { $issues[$i]=$borroweriss2->{$_}; my $dd=$issues[$i]->{'date_due'}; -# warn $_,$dd; #convert to nz style dates #this should be set with some kinda config variable my @tempdate=split(/-/,$dd); diff --git a/circ/returns.pl b/circ/returns.pl index a0a69aae69..c460852332 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -34,7 +34,7 @@ use C4::Reserves2; use C4::Auth; use C4::Interface::CGI::Output; use HTML::Template; - +use C4::Koha; my $query=new CGI; #getting the template @@ -50,11 +50,8 @@ my ($template, $borrowernumber, $cookie) #Global vars my %env; my $headerbackgroundcolor='#99cc33'; -my $circbackgroundcolor='#ffffcc'; -my $circbackgroundcolor='white'; my $linecolor1='#ffffcc'; my $linecolor2='white'; -my $backgroundimage="/images/background-mem.gif"; my $branches = getbranches(); my $printers = getprinters(\%env); @@ -370,8 +367,6 @@ $template->param( genbrname => $branches->{$branch}->{'branchname'}, genprname => $printers->{$printer}->{'printername'}, branch => $branch, printer => $printer, - hdrbckgdcolor => $headerbackgroundcolor, - bckgdimg => $backgroundimage, errmsgloop => \@errmsgloop ); diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl index 8579e26696..4f922d6dc6 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl @@ -2,9 +2,9 @@
-Next Borrower   +/images/button-issues.gif" width="99" height="42" border="0" alt="Next Borrower">   -Returns +/images/button-returns.gif" width="110" height="42" border="0" alt="Returns">
Circulation: Transfers
@@ -17,7 +17,7 @@ - + @@ -153,8 +153,10 @@
background=>Reserve Found
/images/background-mem.gif">Reserve Found
Reserved: reserve found for ( onClick="openWindow(this,'Member', 480, 640)">). Item marked Waiting:
@@ -81,7 +81,7 @@ - +
background=>Messages
/images/background-mem.gif">Messages
@@ -111,10 +111,10 @@ onClick="openWindow(this,'Member', 480, 640)">
- + /images/holder.gif" width=24 height=24>
-
> +
/images/background-mem.gif"> Select Branch
Destination Branch:
- + /images/holder.gif" width=24 height=50 align=left> -
> + /images/background-mem.gif"> Enter Book Barcode
Item Barcode:
@@ -142,7 +142,7 @@ onClick="openWindow(this,'Member', 480, 640)">

- +
background=>Transfered Items
/images/background-mem.gif">Transfered Items
Bar CodeTitleAuthorTypeFromTo
align=center> diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl index 2657e3d98b..7d493f5630 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl @@ -117,7 +117,7 @@
- + > > @@ -129,7 +129,7 @@

- +
- - + + + +
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl index 56b410a72e..94a1d85cd3 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl @@ -2,8 +2,8 @@
-Issues - Issues +/images/button-issues.gif" width="99" height="42" border="0" alt="Issues"> + /images/button-transfers.gif" width="127" height="42" border="0" alt="Issues">
Circulation: Returns
Branch:   @@ -19,7 +19,7 @@ - +
background=>Reserve Found
/images/background-mem.gif">Reserve Found
Item marked Waiting:
@@ -102,7 +102,7 @@ Phone: 		-
align=center background=> +
/images/background-mem.gif"> Enter Book Barcode
Item Barcode:
@@ -116,7 +116,7 @@ Phone: 		- +
background=>Messages
/images/background-mem.gif">Messages
@@ -145,7 +145,7 @@ Phone:
-
background=> +
/images/background-mem.gif"> Returned Item Information
Title:
@@ -154,14 +154,14 @@ Phone: 		- - @@ -198,7 +198,7 @@ Phone:
background=> +
/images/background-mem.gif"> Borrower Information
onClick="openWindow(this,'Member', 480, 640)"> ,
background= colspan=2> +
/images/background-mem.gif" colspan=2> Flags
- -- 2.39.2
background=> +
/images/background-mem.gif"> Returned Items
Due DateBar CodeTitleAuthorTypeBorrower