From dea0fd150ddfffc490a1bbc3e80d3c060d97a84f Mon Sep 17 00:00:00 2001 From: rangi Date: Wed, 31 Jan 2001 21:38:43 +0000 Subject: [PATCH] Added a line to Ouput.pm to enable circulation to use its own includes Changed the look of circulation.pl to the green/yellow colours Note: Steve, i added another variable $backgroundimage that sets the background image for the main tables, so it should be straightforward to change the look back to the colours you had if you want to --- C4/Output.pm | 4 +++ circ/circulation.pl | 65 +++++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/C4/Output.pm b/C4/Output.pm index 8597f28f46..bfbe8cc5c5 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -97,6 +97,8 @@ sub startmenu{ open (FILE,"$path/aquisitions-top.inc")|| die; } elsif ($type eq 'report'){ open (FILE,"$path/reports-top.inc") || die; + } elsif ($type eq 'circulation') { + open (FILE,"$path/circulation-top.inc") || die; } else { open (FILE,"$path/cat-top.inc") || die; } @@ -120,6 +122,8 @@ sub endmenu{ open (FILE,"$path/aquisitions-bottom.inc") || die; } elsif ($type eq 'report') { open (FILE,"$path/reports-bottom.inc") || die; + } elsif ($type eq 'circulation') { + open (FILE,"$path/circulation-bottom.inc") || die; } else { open (FILE,"$path/cat-bottom.inc") || die; } diff --git a/circ/circulation.pl b/circ/circulation.pl index 5a6d8f8554..77b201a95e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -7,11 +7,12 @@ use DBI; my %env; -my $headerbackgroundcolor='#990000'; -my $circbackgroundcolor='#555555'; -my $circbackgroundcolor='#550000'; +my $headerbackgroundcolor='#99cc33'; +#my $circbackgroundcolor='#555555'; +my $circbackgroundcolor='#ffffcc'; my $linecolor1='#bbbbbb'; my $linecolor2='#dddddd'; +my $backgroundimage="/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); my $printers=getprinters(\%env); @@ -74,20 +75,20 @@ print startmenu('circulation'); print << "EOF";

- +
- + - +
$branchname$branchname - + - Branch/Printer + Branch/Printer - + $printername$printername
@@ -109,7 +110,7 @@ if ($printer && $branch) { if ($printercount>1) { $printerform=<<"EOF"; - +
Choose a Printer
Choose a Printer
- +
Choose a Branch
Choose a Branch
Circulation - Returns
+
Circulation - Returns
EOF foreach ($query->param) { (next) unless (/ri-(\d*)/); @@ -190,7 +191,7 @@ EOF my $barcodeentrytext= << "EOF";
- +
Enter Book Barcode
Enter Book Barcode
Item Barcode:
@@ -210,7 +211,7 @@ EOF my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]); my $itemtable=<<"EOF"; - +
Returned Item Information
Returned Item Information
Title: $iteminformation->{'title'}
Author: $iteminformation->{'author'}
@@ -226,7 +227,7 @@ EOF } print << "EOF"; - + @@ -243,7 +244,7 @@ EOF
Messages
Messages
$messagetext
- +
Error
Error
@@ -304,7 +305,7 @@ EOF - +
Error
Error
@@ -322,7 +323,7 @@ EOF print << "EOF";

- + EOF my $color=''; @@ -353,7 +354,7 @@ sub issues { unless ($noheader) { print << "EOF"; -
Returned Items
Returned Items
Due DateBar CodeTitleAuthorClassBorrower
Circulation - Issues
+
Circulation - Issues
EOF } if (my $borrnumber=$query->param('borrnumber')) { @@ -400,7 +401,7 @@ EOF unless ($iteminformation) { print << "EOF"; - +
Error
Error
@@ -414,7 +415,7 @@ EOF } else { print << "EOF" - +
Error Issuing Book
Error Issuing Book
$rejected

@@ -429,7 +430,7 @@ EOF my $stickyduedate=$query->param('stickyduedate'); print << "EOF"; - +
Issuing Question
Issuing Question
\n"; + $flaginfotext.="\n"; } else { $flaginfotext.="\n"; } } if ($flaginfotext) { - $flaginfotext="
@@ -488,7 +489,7 @@ EOF if ($message) { print << "EOF"; - +
Message
Message
$message

@@ -509,13 +510,13 @@ EOF } $flags->{$flag}->{'message'}=~s/\n/
/g; if ($flags->{$flag}->{'noissues'}) { - $flaginfotext.="

$flag$flags->{$flag}->{'message'}
$flag$flags->{$flag}->{'message'}
$flag$flags->{$flag}->{'message'}
$flaginfotext
Patron Flags
\n"; + $flaginfotext="$flaginfotext
Patron Flags
\n"; } $env{'nottodaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); @@ -580,7 +581,7 @@ EOF
- +
Enter Book Barcode
Enter Book Barcode
@@ -615,7 +616,7 @@ EOF
Item Barcode:
- + $todaysissues
Issues Today
Issues Today
Due DateBar CodeTitleAuthorClass
@@ -624,7 +625,7 @@ EOF
- + $previssues
Previous Issues
Previous Issues
Due DateBar CodeTitleAuthorClass
@@ -654,7 +655,7 @@ EOF print "\n"; print "\n"; print ""; - print "\n"; + print "\n"; print "
Select a borrower
Select a borrower
\n"; print " - +
Enter borrower card number
or partial last name
Enter borrower card number
or partial last name
@@ -734,10 +735,10 @@ sub patrontable { } } } - ($flaginfotext) && ($flaginfotext="$flaginfotext
Patron Flags
\n"); + ($flaginfotext) && ($flaginfotext="$flaginfotext
Patron Flags
\n"); my $patrontable= << "EOF"; - +
Patron Information
Patron Information
{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'} $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}
$borrower->{'streetaddress'} $borrower->{'city'}
-- 2.39.5