[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui newo... [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   06/11/02 14:56:46

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/acqui: neworderempty.tmpl 

Log message:
        reindenting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1

Patches:
Index: neworderempty.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- neworderempty.tmpl  2 Aug 2006 08:07:42 -0000       1.1
+++ neworderempty.tmpl  2 Nov 2006 14:56:46 -0000       1.1.2.1
@@ -6,39 +6,39 @@
 <script language="javascript" type="text/javascript">
 <!--
 function update(f){
-  //collect values
-  quantity=f.quantity.value
-  if (quantity ==0) {
+//collect values
+quantity=f.quantity.value
+if (quantity ==0) {
        alert("Quantity must be >0");
-  }
-  discount=f.discount.value
-  listinc=parseInt(f.listinc.value)
-  currency=f.currency.value
-  applygst=parseInt(f.applygst.value)
-  listprice=f.list_price.value
-  //  rrp=f.rrp.value
-  //  ecost=f.ecost.value  //budgetted cost
-  //  GST=f.GST.value
-  //  total=f.total.value
-  //make useful constants out of the above
-  exchangerate=f.elements[currency].value      //get exchange rate
-  gst_on=(!listinc && applygst);
-  //do real stuff
-  rrp=listprice*exchangerate;
-  ecost=rrp*(100-discount)/100
-  GST=0;
-  if (gst_on){
+}
+discount=f.discount.value
+listinc=parseInt(f.listinc.value)
+currency=f.currency.value
+applygst=parseInt(f.applygst.value)
+listprice=f.list_price.value
+//  rrp=f.rrp.value
+//  ecost=f.ecost.value  //budgetted cost
+//  GST=f.GST.value
+//  total=f.total.value
+//make useful constants out of the above
+exchangerate=f.elements[currency].value      //get exchange rate
+gst_on=(!listinc && applygst);
+//do real stuff
+rrp=listprice*exchangerate;
+ecost=rrp*(100-discount)/100
+GST=0;
+if (gst_on){
     rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
     GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
-  }
+}
 
-  total=(ecost+GST)*quantity
+total=(ecost+GST)*quantity
 
-  f.rrp.value=rrp;
-  f.ecost.value=ecost;
-  f.GST.value=GST;
-  f.total.value=total;
-  return true;
+f.rrp.value=rrp;
+f.ecost.value=ecost;
+f.GST.value=GST;
+f.total.value=total;
+return true;
 }
 
 
@@ -54,16 +54,16 @@
 }
 
 function check(f) {
-  quantity=f.quantity.value
-  title=f.title.value
-  if (title == "") {
+quantity=f.quantity.value
+title=f.title.value
+if (title == "") {
        alert("Title can't be empty");
        return false;
-  }
-  if (quantity ==0) {
+}
+if (quantity ==0) {
        alert("Quantity must be >0");
        return false;
-  }
+}
        document.frusin.submit();
 }
 </script>
@@ -75,21 +75,20 @@
        <!-- /TMPL_IF -->
                <!-- TMPL_IF name="suggestionid" -->(defined from suggestion 
#<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
 </h1>
-       <div id="acqui_basket_summary">
-               <h2>Basket Details</h2>
-               <table>
-               <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>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>
-       </div>
-
-<div id="acqui_newbiblio_edit_catalogue">
-       <h2>catalogue details</h2>
-       <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" 
name="frusin">
+
+<fieldset>
+    <legend>Basket Details</legend>
+    <p><label>Basket Number</label><!-- TMPL_VAR NAME="basketno" -->&nbsp;</p>
+    <p><label>Managed By</label><!-- TMPL_VAR NAME="authorisedbyname" 
-->&nbsp;</p>
+    <p><label>Open On</label><!-- TMPL_VAR NAME="creationdate" -->&nbsp;</p>
+    <p><label>For</label>Supplier Id <!-- TMPL_VAR NAME="booksellerid" 
-->&nbsp;</p>
+    <p><label>Invoice Number</label><!-- TMPL_VAR 
NAME="booksellerinvoicenumber" -->&nbsp;</p>
+    <!-- TMPL_IF name="closedate" --><p><label>Closed On:</label> <!-- 
TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+</fieldset>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+    <fieldset>
+        <legend>Catalogue details</legend>
        <!-- TMPL_UNLESS name="existing" -->
                <input type="hidden" name="existing" value="no" />
        <!-- /TMPL_UNLESS -->
@@ -167,8 +166,9 @@
                <!-- /TMPL_LOOP -->
                </select>
        </p>
-               
-       <h2>Accounting details</h2>
+    </fieldset>
+    <fieldset>
+        <legend>Accounting details</legend>
                <p>
                        <label>Quantity</label>
                        <!-- TMPL_IF name="close" -->
@@ -186,7 +186,7 @@
                        <!--/TMPL_IF-->
                </p>
                <p>
-                       <label>Suppliers List Price</label>
+                <label>Supplier price</label>
                        <!-- TMPL_IF name="close" -->
                                <input type="hidden" size="20" 
name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR 
NAME="listprice" -->
                        <!-- TMPL_ELSE -->
@@ -210,7 +210,7 @@
                        <input type="text" size="20" name="GST" value="" <!-- 
TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
                </p>
                <p>
-                       <label><b>BUDGETED TOTAL</b></label>
+                <label><b>Total</b></label>
                        <input type="text" size="20" name="total" value="" <!-- 
TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
                </p>
                <p>
@@ -218,8 +218,8 @@
                        <input type="text" size="20" name="cost" value="<!-- 
TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> 
/>
                </p>
                <p>
-                       <label>Invoice Number *</label>
-                       <input type="text" size="20" name="invoice"  
value="<!-- TMPL_VAR name="invoice" -->" />
+                <label>Invoice Number</label>
+                <input type="text" size="20" name="invoice"  value="<!-- 
TMPL_VAR name="invoice" -->" />(usually empty)
                </p>
                <p>
                        <label>Notes</label>
@@ -242,8 +242,9 @@
                                <input type="text" size="20" name="sort2" 
value="<!-- TMPL_VAR NAME="sort2" -->" />
                        <!--/TMPL_IF -->
                </p>
+    </fieldset>
                <p>
                        <input type="button" value="OK" 
onclick="check(this.form)" />
                </p>
-       </form>
+</form>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->