Merging from rel-1-2 to trunk

This commit is contained in:
tonnesen 2002-10-28 22:29:08 +00:00
parent b4ff8f24bd
commit b89587c218
5 changed files with 127 additions and 4 deletions

View file

@ -28,7 +28,7 @@
<b>Subtitle:</b> <TMPL_VAR NAME="subtitle"><br>
<b>Author:</b> <TMPL_VAR NAME="author"><br>
<b>Additional Author:</b> <TMPL_VAR NAME="additional"><br>
<b>Series Title:</b> <TMPL_VAR NAME="series"><br>
<b>Series Title:</b> <TMPL_VAR NAME="seriestitle"><br>
<b>Subject:</b> <TMPL_VAR NAME="subject"><br>
<b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
<b>Notes:</b> <TMPL_VAR NAME="notes"><br>

View file

@ -49,7 +49,7 @@ border="0" src="/images/delete-mem.gif">
<b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR
NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
<b>Additional Author:</b> <TMPL_VAR NAME="additional"><br>
<b>Series Title:</b> <TMPL_VAR NAME="series"><br>
<b>Series Title:</b> <TMPL_VAR NAME="seriestitle"><br>
<b>Subject:</b> <TMPL_VAR NAME="subject"><br>
<b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
<b>Notes:</b> <TMPL_VAR NAME="notes"><br>

View file

@ -0,0 +1,112 @@
<TMPL_INCLUDE NAME="cat-top.inc">
<TMPL_IF NAME="loggedinuser">
<p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
<TMPL_ELSE>
<p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
</TMPL_IF>
<center>
<br>
<TMPL_LOOP NAME="BIBITEM_DATA">
<a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">
<img src=/images/requests.gif
width=120 height=42 border=0 align=right border=0></a>
<FONT SIZE=6><em><a
href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">
(<TMPL_VAR NAME="author">)</a></em></FONT><P>
<p>
<form action=/cgi-bin/koha/modbibitem.pl>
<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
<input type=hidden name=biblio value=<TMPL_VAR NAME="biblionumber">>
<!-------------------BIBLIO ITEM------------>
<TABLE CELLSPACING=0 CELLPADDING=5 border=1 align=left>
<TR VALIGN=TOP>
<td bgcolor="99cc33" background="/images/background-mem.gif"
><B><TMPL_VAR NAME="biblioitemnumber"> GROUP - <TMPL_VAR NAME="description"> </b> </TD>
</TR>
<tr VALIGN=TOP >
<TD width=210 >
<INPUT TYPE="image" name="submit" VALUE="modify" height=42 WIDTH=93
BORDER=0 src="/images/modify-mem.gif">
<INPUT TYPE="image" name="delete" VALUE="delete" height=42 WIDTH=93
BORDER=0 src="/images/delete-mem.gif">
<br>
<FONT SIZE=2 face="arial, helvetica">
<b>Biblionumber:</b> <TMPL_VAR NAME="biblionumber"><br>
<b>Item Type:</b> <TMPL_VAR NAME="itemtype"><br>
<b>URL:</b> <TMPL_VAR NAME="url"><br>
<b>Loan Length:</b> <TMPL_VAR NAME="loanlength"><br>
<b>Rental Charge:</b> <TMPL_VAR NAME="rentalcharge"><br>
<b>Classification:</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>
<b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>
<b>Publisher:</b> <TMPL_VAR NAME="publishercode"> <br>
<b>Place:</b> <TMPL_VAR NAME="place"><br>
<b>Date:</b> <TMPL_VAR NAME="publicationyear"><br>
<b>Volume:</b> <TMPL_VAR NAME="volumeddesc"><br>
<b>Pages:</b> <TMPL_VAR NAME="pages"><br>
<b>Illus:</b> <TMPL_VAR NAME="illus"><br>
<b>Size:</b> <TMPL_VAR NAME="size"><br>
<b>Notes:</b> <TMPL_VAR NAME="bnotes"><br>
<b>No. of Items:</b> <TMPL_VAR NAME="count">
</font>
</TD>
</tr>
</table>
</form>
</TMPL_LOOP>
<TMPL_LOOP NAME="ITEM_DATA">
<img src="/images/holder.gif" width=16 height=300 align=left>
<TABLE CELLSPACING=0 CELLPADDING=5 border=1 align=left width=220 >
<TR VALIGN=TOP>
<td bgcolor="99cc33" background="/images/background-mem.gif"><B>BARCODE
<TMPL_VAR NAME="barcode"></b></TD>
</TR>
<tr VALIGN=TOP>
<TD width=220>
<form action=/cgi-bin/koha/moditem.pl method=post>
<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
<input type=hidden name=item value=<TMPL_VAR NAME="itemnumber">>
<input type=hidden name=type value=<TMPL_VAR NAME="type">>
<INPUT TYPE="image" name="submit" VALUE="modify" height=42 WIDTH=93
BORDER=0 src="/images/modify-mem.gif">
<INPUT TYPE="image" name="delete" VALUE="delete" height=42 WIDTH=93
BORDER=0 src="/images/delete-mem.gif">
<br>
<FONT SIZE=2 face="arial, helvetica">
<b>Home Branch:</b> <TMPL_VAR NAME="homebranch"><br>
<b>Last seen:</b> <TMPL_VAR NAME="datelastseen"><br>
<b>Last borrowed:</b> <TMPL_VAR NAME="timestamp0"><br>
<!-- on issue bit -->
<b>Last Borrower 1:</b> <TMPL_VAR NAME="card0"><br>
<b>Last Borrower 2:</b> <TMPL_VAR NAME="card1"><br>
<b>Current Branch:</b> <TMPL_VAR NAME="holdingbranch"><br>
<b>Replacement Price:</b> <TMPL_VAR NAME="replacementprice"><br>
<b>Item lost:</b> <TMPL_VAR NAME="itemlost"><br>
<b>Paid for:</b> <TMPL_VAR NAME="paidfor"><br>
<b>Notes:</b> <TMPL_VAR NAME="itemnotes"><br>
<b>Renewals:</b> <TMPL_VAR NAME="renewals"><br>
<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<TMPL_VAR NAME="ordernumber">&biblio=<TMPL_VAR NAME="biblionumber">&invoice=<TMPL_VAR NAME="booksellerinvoicenumber">&catview=yes">
Accession</a>
Date:<TMPL_VAR NAME="dateaccessioned"><br>
<b>Cancelled: <TMPL_VAR NAME="wthdrawn"><br>
<b><a
href=/cgi-bin/koha/bookcount.pl?&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">&itm=<TMPL_VAR NAME="itemnumber">>Total
Issues:</a></b> <TMPL_VAR NAME="issues"><br>
<b>Group Number:</b> <TMPL_VAR NAME="biblioitemnumber"> <br>
<b>Biblio number:</b> <TMPL_VAR NAME="biblionumber"> <br>
</font>
</TD>
</tr>
</table>
</form>
</TMPL_LOOP>
<p>
</form>
</center>
<TMPL_INCLUDE NAME="cat-bottom.inc">

View file

@ -23,9 +23,9 @@
<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>><td colspan=4>
<table border=0 cellpadding=0 cellspacing=0 width=100%>
<tr><td align=left>
<a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="prevstartfrom">>Previous Records</a>
<a href=search.pl?<TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="prevstartfrom">>Previous Records</a>
</td><td align=right>
<a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="nextstartfrom">>Next Records</a>
<a href=search.pl?<TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="nextstartfrom">>Next Records</a>
</td></tr>
</table>
</td></tr>

View file

@ -27,6 +27,8 @@ use CGI;
use C4::Search;
use C4::Catalogue;
use C4::Output; # contains gettemplate
use C4::Auth;
my $query=new CGI;
my $includes = C4::Context->config('includes') ||
@ -41,6 +43,11 @@ if ($subject){
} else {
$template = gettemplate("catalogue/moredetail.tmpl");
}
my $flagsrequired;
$flagsrequired->{catalogue}=1;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, $flagsrequired);
# get variables
my $biblionumber=$query->param('bib');
my $title=$query->param('title');
@ -65,6 +72,9 @@ my $count=@items;
$data->{'count'}=$count;
my ($order,$ordernum)=getorder($bi,$biblionumber);
my $env;
$env->{itemcount}=1;
$results[0]=$data;
foreach my $item (@items){
@ -92,5 +102,6 @@ foreach my $item (@items){
$template->param(includesdir => $includes);
$template->param(BIBITEM_DATA => \@results);
$template->param(ITEM_DATA => \@items);
$template->param(loggedinuser => $loggedinuser);
print "Content-Type: text/html\n\n", $template->output;