[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/baske... [rel_2_2]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/baske... [rel_2_2] |
|
Date: |
Mon, 25 Sep 2006 19:01:02 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <oleonard> 06/09/25 19:01:02
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: basket.tmpl
lateorders.tmpl
newbiblio.tmpl order.tmpl
koha-tmpl/intranet-tmpl/npl/en/members: moremember.tmpl
Log message:
Synching with latest changes to default templates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.8&r2=1.2.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.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/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.8&r2=1.2.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.12&r2=1.5.2.13
Patches:
Index: acqui/basket.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -b -r1.2.2.8 -r1.2.2.9
--- acqui/basket.tmpl 13 Sep 2006 19:28:26 -0000 1.2.2.8
+++ acqui/basket.tmpl 25 Sep 2006 19:01:02 -0000 1.2.2.9
@@ -27,6 +27,12 @@
<tr><td><!-- TMPL_VAR name="address3" --></td></tr>
<tr><td><!-- TMPL_VAR name="address4" --></td></tr>
</table>
+
+ <table>
+ <tr><th rowspan="4">For Branch:</th><td><!-- TMPL_VAR
name="branchname" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="branchaddress1" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="branchaddress2" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="branchaddress3" --></td></tr></table>
</div>
<div class="data">
@@ -43,8 +49,10 @@
<th scope="col">Total</th>
<th scope="col"><a href="basket.pl?basket=<!--
TMPL_VAR name="basketno"
-->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
<!-- TMPL_IF name="active" -->
+ <!-- TMPL_UNLESS
name="closedate" -->
<th scope="col">Remove</th>
<th scope="col">Edit</th>
+ <!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
@@ -75,6 +83,7 @@
<td><!-- TMPL_VAR NAME="line_total"
--></td>
<td><!-- TMPL_VAR NAME="bookfundid"
--></td>
<!-- TMPL_IF name="active" -->
+ <!-- TMPL_UNLESS
name="closedate" -->
<td>
<form
action="addorder.pl" method="get"><input type="hidden" name="ordnum"
value="<!-- TMPL_VAR NAME="ordernumber" -->" /><input type="hidden"
name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input
type="hidden" name="quantity" value="0" /><input type="hidden" name="biblio"
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit"
class="delete" value="Delete" /></form>
</td>
@@ -82,6 +91,7 @@
<form action="newbiblio.pl"
method="get"><input type="hidden" name="sub" value="" /><input type="hidden"
name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /><input
type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->"
/><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber"
-->" /><input type="hidden" name="ordnum" value="<!-- TMPL_VAR
NAME="ordernumber" -->" /><!--TMPL_IF name="closedate"--><input type="hidden"
name="close" value="1" /><!--/TMPL_IF --><input type="submit" class="submit"
value="Edit" />
</form>
</td>
+ <!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
Index: acqui/lateorders.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/lateorders.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
--- acqui/lateorders.tmpl 5 Jan 2006 22:44:23 -0000 1.1.2.2
+++ acqui/lateorders.tmpl 25 Sep 2006 19:01:02 -0000 1.1.2.3
@@ -57,7 +57,7 @@
<!-- TMPL_VAR name="latesince" -->
</td>
<td>
- <!-- TMPL_VAR name="basketno" -->
+ <a href="basket.pl?basket=<!-- TMPL_VAR
name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a>
</td>
<td >
<b><!-- TMPL_VAR name="title" --></b>
Index: acqui/newbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -b -r1.2.2.8 -r1.2.2.9
--- acqui/newbiblio.tmpl 13 Sep 2006 19:53:58 -0000 1.2.2.8
+++ acqui/newbiblio.tmpl 25 Sep 2006 19:01:02 -0000 1.2.2.9
@@ -67,7 +67,7 @@
</script>
<div id="main">
-<form action="basket.pl" method="get" style="float: right"><input
type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basket" -->" /><input
type="submit" value="View Basket" class="submit" /></form>
+<form action="basket.pl" method="get" style="float: right"><input
type="hidden" name="basket" value="<!-- TMPL_VAR NAME="basketno" -->" /><input
type="submit" value="View Basket" class="submit" /></form>
<form action="/cgi-bin/koha/acqui/addorder.pl" method="post"
name="frusin">
<!-- TMPL_UNLESS name="existing" --><input type="hidden"
name="existing" value="no" /><!-- /TMPL_UNLESS -->
<!-- <!-- TMPL_VAR NAME="title" --> -->
Index: acqui/order.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/order.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -b -r1.2.2.6 -r1.2.2.7
--- acqui/order.tmpl 7 Jul 2006 15:47:55 -0000 1.2.2.6
+++ acqui/order.tmpl 25 Sep 2006 19:01:02 -0000 1.2.2.7
@@ -9,7 +9,7 @@
<th>Order</th>
<th>Receive</th>
<th>Company</th>
- <th>Exisiting Baskets</th>
+ <th>Basket</th>
</tr>
<!-- TMPL_LOOP name="loop_suppliers" -->
@@ -23,6 +23,7 @@
<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR
name="supplierid" -->&op=display"><!-- TMPL_VAR name="name" --></a></td>
<td>
<div class="data"><table>
+ <!-- TMPL_IF name="loop_basket" -->
<tr>
<th scope="col">Basket</th>
<th scope="col">Items</th>
@@ -30,6 +31,9 @@
<th scope="col">Date</th>
<th scope="col"> </th>
</tr>
+ <!-- TMPL_ELSE -->
+ <tr><td>No pending basket</td></tr>
+ <!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="loop_basket" -->
<tr>
<td><!-- TMPL_VAR
NAME="basketno" --></a></td>
Index: members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/moremember.tmpl,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -b -r1.5.2.12 -r1.5.2.13
--- members/moremember.tmpl 23 May 2006 00:26:00 -0000 1.5.2.12
+++ members/moremember.tmpl 25 Sep 2006 19:01:02 -0000 1.5.2.13
@@ -11,7 +11,7 @@
<!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS
NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl"
method="post"> <input type="submit" name="submit" value="Add Child"
class="submit" alt="Add Child" /><input type="hidden" name="type" value="add"
/><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
name="borrowernumber" -->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!--
/Hide from NPL -->
-<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form
action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" />
<input type="submit" name="modify" class="submit" value="Edit" /></form>
+<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form
action="/cgi-bin/koha/members/memberentry.pl" method="post"><input
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->"
/><input type="hidden" name="categorycode" value="I" /> <input type="submit"
name="modify" class="submit" value="Edit" /></form>
<!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl"
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR
name="bornum" -->" /> <input type="submit" class="submit" name="modify"
value="Edit" /></form>
<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/baske... [rel_2_2],
Owen Leonard <=