[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... [dev_week]
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/baske... [dev_week] |
|
Date: |
Thu, 03 Aug 2006 18:09:39 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/08/03 18:09:39
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: basket.tmpl
koha-tmpl/intranet-tmpl/npl/en/circ: selectbranchprinter.tmpl
koha-tmpl/intranet-tmpl/npl/en/members: imemberentry.tmpl
newimember.tmpl
Log message:
sync with rel_2_2
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2&r2=1.2.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2&r2=1.2.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
Patches:
Index: acqui/basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- acqui/basket.tmpl 8 Jun 2005 17:03:00 -0000 1.2.2.4
+++ acqui/basket.tmpl 3 Aug 2006 18:09:39 -0000 1.2.2.4.2.1
@@ -5,18 +5,29 @@
<div id="main">
<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS
-->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR
NAME="name" --></a></h1><br />
<!-- TMPL_UNLESS name="closedate" -->
+ <!-- TMPL_IF name="basketno" -->
<div class="data">
<table>
<caption>Basket Details</caption>
- <tr><th>Basket Number:</th><td><!-- TMPL_VAR
NAME="basketno" --></td></tr>
<tr><th>Managed By:</th><td><!-- TMPL_VAR
NAME="authorisedbyname" --></td></tr>
+ <tr><th>Basket Number:</th><td><!-- TMPL_VAR
NAME="basketno" --></td></tr>
<tr><th>Open On:</th><td><!-- TMPL_VAR
NAME="creationdate" --></td></tr>
- <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR
NAME="booksellerid" --></td></tr>
<tr><th>Invoice Number:</th><td><!-- TMPL_VAR
NAME="booksellerinvoicenumber" --></td></tr>
<!-- TMPL_IF name="closedate" --><tr><th>Closed
On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
- </table><!-- TMPL_UNLESS name="closedate" --><form
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden"
name="op" value="close" /><input type="hidden" name="basket" value="<!--
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier"
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit"
class="submit" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
- </div>
+ </table>
+
+ <!-- TMPL_UNLESS name="closedate" --><form
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden"
name="op" value="close" /><input type="hidden" name="basket" value="<!--
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier"
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit"
class="submit" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
+
+ <!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
+ <table>
+ <tr><th>For:</th><td><!-- TMPL_VAR NAME="name" --></td></tr>
+ <tr><th rowspan="4">Address:</th><td><!-- TMPL_VAR
name="postal" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="address2" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="address3" --></td></tr>
+ <tr><td><!-- TMPL_VAR name="address4" --></td></tr>
+ </table>
+ </div>
<div class="data">
<!-- TMPL_IF name="books_loop" -->
@@ -31,10 +42,9 @@
<th scope="col">Qty.</th>
<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" -->
+ <!-- TMPL_IF name="active" -->
<th scope="col">Remove</th>
- <!-- /TMPL_UNLESS -->
+ <th scope="col">Edit</th>
<!-- /TMPL_IF -->
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
@@ -52,7 +62,7 @@
<!-- TMPL_ELSE -->
<td>
<p>
- <a
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber"
-->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
+ <a
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber"
-->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
<!-- TMPL_VAR
NAME="author" -->
<!-- TMPL_IF
name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF
name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
@@ -65,36 +75,40 @@
<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>
- <!-- /TMPL_UNLESS -->
+ <td>
+ <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_IF -->
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <td colspan="2" rowspan="3">
-<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->"
/><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno"
-->" /> </td>
+ <td colspan="2" rowspan="3"> </td>
<th>SubTotal</th>
<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
- <th><!-- TMPL_VAR NAME="sub_total" --></td>
- <th><!-- TMPL_VAR name="qty_total" --></th>
- <td colspan="2" rowspan="3"> </td>
+ <th> </th>
+ <th><!-- TMPL_VAR name="qty_total" --></td>
+ <th><!-- TMPL_VAR NAME="sub_total" --></th>
+ <td colspan="3" rowspan="3"> </td>
</tr>
<tr>
<th>GST</th>
<th><!-- TMPL_VAR NAME="gist_est" --></th>
- <th><!-- TMPL_VAR NAME="gist" --></th>
<th> </th>
+ <th> </th>
+ <th><!-- TMPL_VAR NAME="gist" --></th>
</tr>
<tr>
<th>TOTAL (<!-- TMPL_VAR NAME="currency"
-->)</th>
<th><!-- TMPL_VAR NAME="grand_total_est"
--></th>
- <th><!-- TMPL_VAR NAME="grand_total" --></th>
<th> </th>
+ <th> </th>
+ <th><!-- TMPL_VAR NAME="grand_total" --></th>
</tr>
</table>
<!-- TMPL_ELSE -->
@@ -104,6 +118,7 @@
</table>
<!-- /TMPL_IF -->
</div>
+ <!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<div class="details">
<h2>Add To Order</h2>
@@ -117,6 +132,7 @@
</form>
</div>
<!-- /TMPL_UNLESS -->
+ <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: circ/selectbranchprinter.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- circ/selectbranchprinter.tmpl 13 Apr 2004 16:53:45 -0000 1.2
+++ circ/selectbranchprinter.tmpl 3 Aug 2006 18:09:39 -0000 1.2.4.1
@@ -18,14 +18,14 @@
</select>
</div>
<div class="details">
-<!-- <label for="printer">Choose a Network Printer:</label> -->
+<label for="printer">Choose a Network Printer:</label>
<!--printerselection-->
-<!-- <select name="printer" id="printer">
+<select name="printer" id="printer">
<!-- TMPL_LOOP Name="printerloop" -->
<option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF
Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR
Name="name" -->
<!-- /TMPL_LOOP -->
</select>
- --><input type="hidden" name="setcookies" value="1" />
+<input type="hidden" name="setcookies" value="1" />
<p><input type="submit" class="submit" value="Submit" name="changesettings"
/></p></div>
</form>
Index: members/imemberentry.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- members/imemberentry.tmpl 13 Apr 2004 16:59:42 -0000 1.2
+++ members/imemberentry.tmpl 3 Aug 2006 18:09:39 -0000 1.2.4.1
@@ -4,7 +4,7 @@
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
-<form action="/cgi-bin/koha/newimember.pl" method="post">
+<form action="/cgi-bin/koha/members/newimember.pl" method="post">
<!-- TMPL_IF name="surname" -->
<h1>Edit Institution</h1>
<!-- TMPL_ELSE -->
Index: members/newimember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- members/newimember.tmpl 20 Jan 2005 19:36:58 -0000 1.1.2.1
+++ members/newimember.tmpl 3 Aug 2006 18:09:39 -0000 1.1.2.1.2.1
@@ -11,7 +11,7 @@
<div class="details">
<h3>Valid values</h3>
<p>Click below to confirm this new borrower.</p>
- <form action="/cgi-bin/koha/insertidata.pl" method="post">
+ <form action="/cgi-bin/koha/members/insertidata.pl"
method="post">
<!-- TMPL_LOOP NAME="inputsloop" -->
<input type="hidden" name="<!-- TMPL_VAR
NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->" />
<!-- /TMPL_LOOP -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/baske... [dev_week],
Joshua Ferraro <=