[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.2,1.2.2.1 order.tmpl,1.2.2.1,1.2.2.2 recieveorder.tmpl,1.1.2.1,1.1.2.2 |
|
Date: |
Thu, 14 Apr 2005 14:28:39 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23039/koha-tmpl/intranet-tmpl/npl/en/acqui
Modified Files:
Tag: rel_2_2
newbiblio.tmpl order.tmpl recieveorder.tmpl
Log Message:
Synching with default template
Index: newbiblio.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** newbiblio.tmpl 28 Oct 2004 17:12:27 -0000 1.2
--- newbiblio.tmpl 14 Apr 2005 21:28:27 -0000 1.2.2.1
***************
*** 8,11 ****
--- 8,14 ----
//collect values
quantity=f.quantity.value
+ if (quantity ==0) {
+ alert("Quantity must be >0");
+ }
discount=f.discount.value
listinc=parseInt(f.listinc.value)
***************
*** 35,51 ****
f.GST.value=GST;
f.total.value=total;
!
}
-
-
function messenger(X,Y,etc){
! win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
! win.focus();
! win.document.close();
! win.document.write("<body link='#333333' bgcolor='#ffffff'
text='#000000'><font size='2'><p><br>");
! win.document.write(etc);
! win.document.write("<center><form><input type=button onclick='self.close()'
value='Close'></form></center>");
! win.document.write("</font></body></html>");
}
//-->
--- 38,66 ----
f.GST.value=GST;
f.total.value=total;
! return true;
}
function messenger(X,Y,etc){
!
win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
! win.focus();
! win.document.close();
! win.document.write("<body link='#333333' bgcolor='#ffffff'
text='#000000'><font size='2'><p><br>");
! win.document.write(etc);
! win.document.write("<center><form><input type=button
onclick='self.close()' value='Close'></form></center>");
! win.document.write("</font></body></html>");
! }
!
! function check(f) {
! quantity=f.quantity.value
! title=f.title.value
! if (title == "") {
! alert("Title can't be empty");
! return false;
! }
! if (quantity ==0) {
! alert("Quantity must be >0");
! return false;
! }
! document.frusin.submit();
}
//-->
***************
*** 80,98 ****
</h1>
<h2>Shopping Basket For <span class="ex"><!-- TMPL_VAR NAME="name"
--></span></h2>
! <div class="details">
<table>
<caption>Catalog Details</caption>
! <tr><th><label for="title">Title
*</label></th><td><input type="text" size="20" id="title" name="title"
value="<!-- TMPL_VAR NAME="title" -->" /></td></tr>
! <tr><th><label
for="author">Author</label></th><td><input type="text" size="20" id="author"
name="author" value="<!-- TMPL_VAR NAME="author" -->" /></td></tr>
! <tr><th><label for="publishercode">
Publisher</label></th><td><input type="text" size="30" id="publishercode"
name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /></td></tr>
! <tr><th><label for="copyrightdate">Copyright
Date</label></th><td><input type="text" size="20" id="copyrightdate"
name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /></td></tr>
<tr><th><label
for="itemtype">Format</label></th><td><!-- TMPL_VAR NAME="CGIitemtype"
--></td></tr>
! <tr><th><label for="ISBN">ISBN</label></th><td><input
type="text" size="20" id="ISBN" name="ISBN" value="<!-- TMPL_VAR NAME="isbn"
-->"></td></tr>
! <tr><th><label for="Series">Series</label></th><td><input
type="text" size="20" id="Series" name="Series" value="<!-- TMPL_VAR
NAME="seriestitle" -->" /></td></tr>
<tr><th><label for="branch">Branch</label></th><td><!--
TMPL_VAR NAME="CGIbranch" --></td></tr>
</table>
</div>
! <div class="details">
<table>
<caption>Accounting details</caption>
--- 95,135 ----
</h1>
<h2>Shopping Basket For <span class="ex"><!-- TMPL_VAR NAME="name"
--></span></h2>
! <div class="data">
<table>
<caption>Catalog Details</caption>
! <tr><th><label for="title">Title *</label></th><td><!--
TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="title"
value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
! <!-- TMPL_ELSE --><input type="text" size="20"
id="title" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- /TMPL_IF
--></td></tr>
! <tr><th><label for="author">Author</label></th><td><!--
TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="author"
value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="author"
value="<!-- TMPL_VAR NAME="author" -->" />
! <!-- /TMPL_IF --></td></tr>
! <tr><th><label for="publishercode">
Publisher</label></th><td> <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20"
name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!--
TMPL_VAR NAME="publishercode" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20"
name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
! <!-- /TMPL_IF --></td></tr>
! <tr><th><label for="copyrightdate">Copyright
Date</label></th><td><!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20"
name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR
NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20"
name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR
NAME="copyrightdate" -->" />
! <!-- /TMPL_IF --></td></tr>
<tr><th><label
for="itemtype">Format</label></th><td><!-- TMPL_VAR NAME="CGIitemtype"
--></td></tr>
! <tr><th><label for="ISBN">ISBN</label></th><td><!--
TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="ISBN"
value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="ISBN"
value="<!-- TMPL_VAR NAME="isbn" -->" />
! <!-- /TMPL_IF --></td></tr>
! <tr><th><label for="Series">Series</label></th><td><!-- TMPL_IF
name="biblio" -->
! <input type="hidden" size="20" name="series"
value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle"
-->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="series"
value="<!-- TMPL_VAR NAME="seriestitle" -->" />
! <!-- /TMPL_IF --></td></tr>
<tr><th><label for="branch">Branch</label></th><td><!--
TMPL_VAR NAME="CGIbranch" --></td></tr>
</table>
</div>
! <div class="data">
<table>
<caption>Accounting details</caption>
***************
*** 106,115 ****
<tr><th><label for="cost">Actual Cost</label></th><td><input
type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR
name="ecost"-->" /></td></tr>
<tr><th><label for="invoice">Invoice Number
*</label></th><td><input type="text" size="20" id="invoice" name="invoice"
value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
! <tr><th><label for="notes">Notes</label></th><td><input
type="text" size="20" id="notes" name="notes" value="<!-- TMPL_VAR NAME="notes"
-->" /></td></tr>
<tr><th><label for="sort1">Sort field 1</label></th><td><input
type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1"
-->" /></td></tr>
<tr><th><label for="sort2">Sort field 2</label></th><td><input
type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2"
-->" /></td></tr>
! </table></div> <p>The 'Sort' fields are available for your own
usage. They can be useful for stat purposes</p>
<p>
! <input type="submit" value="Submit" class="submit" />
</p>
--- 143,153 ----
<tr><th><label for="cost">Actual Cost</label></th><td><input
type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR
name="ecost"-->" /></td></tr>
<tr><th><label for="invoice">Invoice Number
*</label></th><td><input type="text" size="20" id="invoice" name="invoice"
value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
! <tr><th><label for="notes-details">Notes</label></th><td><input
type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR
NAME="notes" -->" /></td></tr>
<tr><th><label for="sort1">Sort field 1</label></th><td><input
type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1"
-->" /></td></tr>
<tr><th><label for="sort2">Sort field 2</label></th><td><input
type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2"
-->" /></td></tr>
! </table></div>
! <p>The 'Sort' fields are available for your own usage. They can
be useful for stat purposes</p>
<p>
! <input type="submit" value="Submit" class="submit"
onClick="check(this.form); return false;" />
</p>
Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** order.tmpl 20 Jan 2005 19:31:58 -0000 1.2.2.1
--- order.tmpl 14 Apr 2005 21:28:27 -0000 1.2.2.2
***************
*** 7,29 ****
<caption>Supplier Search Results</caption>
<tr>
! <th colspan="2">Action</th>
<th>Company</th>
! <th>
! <table>
! <tr>
! <th>Basket</th>
! <th>Items</th>
! <th>Created by</th>
! <th>Date</th>
! <th> </th>
! </tr>
! </table>
! </th>
</tr>
<!-- TMPL_LOOP name="loop_suppliers" -->
<tr>
! <td>
! <a href="basket.pl?id=<!-- TMPL_VAR name=supplierid
-->">Add</a>
</td>
<td>
--- 7,20 ----
<caption>Supplier Search Results</caption>
<tr>
! <th>Order</th>
! <th>Receive</th>
<th>Company</th>
! <th>Exisiting Baskets</th>
</tr>
<!-- TMPL_LOOP name="loop_suppliers" -->
<tr>
! <td><!-- TMPL_IF name="active" -->
! <a href="basket.pl?supplierid=<!-- TMPL_VAR
name=supplierid -->">Add Order</a><!-- TMPL_ELSE --> Inactive<!--
/TMPL_IF -->
</td>
<td>
***************
*** 32,40 ****
<td><a href="supplier.pl?id=<!-- TMPL_VAR name=supplierid
-->"><!-- TMPL_VAR name="name" --></a></td>
<td>
! <table>
<!-- TMPL_LOOP NAME="loop_basket" -->
<tr>
<td><!-- TMPL_VAR
NAME="basketno" --></a></td>
! <td><TMPL_VAR
NAME="total"></td>
<td>
<!-- TMPL_VAR
name="firstname" -->
--- 23,38 ----
<td><a href="supplier.pl?id=<!-- TMPL_VAR name=supplierid
-->"><!-- TMPL_VAR name="name" --></a></td>
<td>
! <div class="data"><table>
! <tr>
! <th scope="col">Basket</th>
! <th scope="col">Items</th>
! <th scope="col">Created by</th>
! <th scope="col">Date</th>
! <th scope="col"> </th>
! </tr>
<!-- TMPL_LOOP NAME="loop_basket" -->
<tr>
<td><!-- TMPL_VAR
NAME="basketno" --></a></td>
! <td><!-- TMPL_VAR
NAME="total" --></td>
<td>
<!-- TMPL_VAR
name="firstname" -->
***************
*** 44,49 ****
<td>
<!-- TMPL_IF
name="closedate" -->
! closed
on <!-- TMPL_VAR NAME="closedate" -->
! <a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->">View</a>
<!-- TMPL_ELSE
-->
<a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->">Modify</a>
--- 42,47 ----
<td>
<!-- TMPL_IF
name="closedate" -->
! Closed
on <!-- TMPL_VAR NAME="closedate" -->
! <a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->">(View)</a>
<!-- TMPL_ELSE
-->
<a
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno"
-->">Modify</a>
***************
*** 52,56 ****
</tr>
<!-- /TMPL_LOOP -->
! </table>
</tr>
<!-- /TMPL_LOOP -->
--- 50,54 ----
</tr>
<!-- /TMPL_LOOP -->
! </table></div>
</tr>
<!-- /TMPL_LOOP -->
Index: recieveorder.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** recieveorder.tmpl 20 Jan 2005 19:31:59 -0000 1.1.2.1
--- recieveorder.tmpl 14 Apr 2005 21:28:27 -0000 1.1.2.2
***************
*** 8,15 ****
<form method="get" action="receive.pl">
<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
! <div class="details table">
<table>
<caption>Supplier Invoice Information</caption>
! <tr >
<th>Supplier Invoice Number</th>
<td><input type="text" size="20" name="invoice" />
--- 8,15 ----
<form method="get" action="receive.pl">
<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
! <div class="data">
<table>
<caption>Supplier Invoice Information</caption>
! <tr>
<th>Supplier Invoice Number</th>
<td><input type="text" size="20" name="invoice" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.2,1.2.2.1 order.tmpl,1.2.2.1,1.2.2.2 recieveorder.tmpl,1.1.2.1,1.1.2.2,
Owen Leonard <=