[Koha-cvs] koha updater/updatedatabase members/moremember.... [rel_2_2]
Robert Lyon
bob at katipo.co.nz
Wed Jan 31 21:39:04 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Robert Lyon <bob_lyon> 07/01/31 20:39:04
Modified files:
updater : updatedatabase
members : moremember.pl
koha-tmpl/intranet-tmpl/npl/en/members: moremember-receipt.tmpl
koha-tmpl/intranet-tmpl/npl/en/includes: blank.css
Log message:
adding in style changes to the print slip receipt layout
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_2_2&r1=1.100.2.57&r2=1.100.2.58
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.14&r2=1.5.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember-receipt.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/blank.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
Patches:
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.5.2.14
retrieving revision 1.5.2.15
diff -u -b -r1.5.2.14 -r1.5.2.15
--- members/moremember.pl 8 Mar 2006 22:59:33 -0000 1.5.2.14
+++ members/moremember.pl 31 Jan 2007 20:39:03 -0000 1.5.2.15
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.5.2.14 2006/03/08 22:59:33 oleonard Exp $
+# $Id: moremember.pl,v 1.5.2.15 2007/01/31 20:39:03 bob_lyon Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -176,6 +176,8 @@
} else {
$row{'norenew'}=0;
}
+ $row{'today'}= format_date($today);
+
push (@issuedata, \%row);
}
@@ -193,6 +195,9 @@
push (@reservedata, \%row);
}
+my $libraryaddress = C4::Context->preference("LibraryAddress");
+$libraryaddress =~ s/\r/\<br\>/g;
+
$template->param($data);
$template->param(
bornum => $bornum,
@@ -205,6 +210,8 @@
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
patronimages => C4::Context->preference("patronimages"),
+ libraryaddress => $libraryaddress,
+ today => $today,
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/npl/en/members/moremember-receipt.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/moremember-receipt.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/npl/en/members/moremember-receipt.tmpl 31 Jan 2006 22:39:00 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/members/moremember-receipt.tmpl 31 Jan 2007 20:39:04 -0000 1.1.2.3
@@ -1,43 +1,86 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --><!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
<!-- main site -->
-<div id="main">
-<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+<div id="letter">
+ <div class="letterhead">
+<h2><!-- TMPL_VAR name="LibraryName" --></h2>
+<p><!-- TMPL_VAR name="LibraryAddress" --></p>
+ </div>
+<b>Patron:</b><br />
+<div class="patron">
<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- /TMPL_IF -->
-Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
-<!-- TMPL_VAR NAME="todaysdate" --><br>
-<table>
+<!-- TMPL_VAR NAME="title" -->
+<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">">
+<!-- TMPL_VAR NAME="firstname" -->
+<!-- TMPL_VAR NAME="surname" -->
+</a><br />
+<!-- TMPL_VAR NAME="streetaddress" -->
+<br>
+<!-- TMPL_VAR NAME="suburb" -->
+<!-- TMPL_VAR NAME="city" -->
+</div>
+
+
+ <table>
<caption>Issues</caption>
- <tr>
- <th>Date Due</th>
+ <tr class="top">
<th>Title</th>
+ <th>Ship Date</th>
+ <th>Due Date</th>
+ <th>Comments</th>
</tr>
<!-- TMPL_loop name="issueloop" -->
- <!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="red" -->
+ <!-- TMPL_ELSE -->
+ <tr>
+ <td rowspan="3"><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td rowspan="3"><!-- TMPL_VAR NAME="today" --></td>
+ <td rowspan="3"><!-- TMPL_VAR NAME="date_due" --></td>
+ <td class="lines"> </td>
+ </tr>
+ <tr>
+ <td class="lines"> </td>
+ </tr>
<tr>
- <td><!-- TMPL_VAR NAME="date_due" --></td>
- <td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td class="lines"> </td>
</tr>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
+ <tr class="base"><td colspan="4"> </td></tr>
</table>
+<br />
+<br />
<table>
<caption>Overdues</caption>
- <tr>
- <th>Date Due</th>
+ <tr class="top">
<th>Title</th>
+ <th>Ship Date</th>
+ <th>Due Date</th>
+ <th>Comments</th>
</tr>
<!-- TMPL_LOOP NAME="issueloop" -->
- <!-- TMPL_IF NAME="red" --><tr>
- <td><!-- TMPL_VAR NAME="date_due" --></td>
- <td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <!-- TMPL_IF NAME="red" -->
+ <tr>
+ <td rowspan="3"><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td rowspan="3"><!-- TMPL_VAR NAME="today" --></td>
+ <td rowspan="3"><!-- TMPL_VAR NAME="date_due" --></td>
+ <td class="lines"> </td>
+ </tr>
+ <tr>
+ <td class="lines"> </td>
+ </tr>
+ <tr>
+ <td class="lines"> </td>
+ </tr>
</tr>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
+ <tr class="base"><td colspan="4"> </td></tr>
</table>
+
</div>
<!-- endmenu -->
Index: koha-tmpl/intranet-tmpl/npl/en/includes/blank.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/blank.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/npl/en/includes/blank.css 27 Oct 2004 16:09:15 -0000 1.1
+++ koha-tmpl/intranet-tmpl/npl/en/includes/blank.css 31 Jan 2007 20:39:04 -0000 1.1.2.1
@@ -60,3 +60,40 @@
border-left : 0px solid #CCCC99;
position : relative;
}
\ No newline at end of file
+
+/* #################### */
+/* Print Slip */
+
+div.letterhead {
+ margin-left: 40%;
+}
+
+div#letter {
+ margin: 0px 10px 10px 10px;
+}
+
+div.patron {
+ padding-left: 10px;
+}
+
+div#letter table {
+ width: 100%;
+}
+
+div#letter tr.top {
+ border-top: 1px dashed #666;
+ border-bottom: 1px solid #000;
+}
+
+div#letter tr.base {
+ border-bottom: 1px dashed #666;
+}
+
+div#letter th {
+ padding-top: 10px;
+}
+
+div#letter td.lines {
+ border-bottom: 1px solid #000;
+ width: 30%;
+}
More information about the Koha-cvs
mailing list