css'ing acquisitions
authortipaul <tipaul>
Thu, 17 Jun 2004 08:19:40 +0000 (08:19 +0000)
committertipaul <tipaul>
Thu, 17 Jun 2004 08:19:40 +0000 (08:19 +0000)
koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl

index be98c67..e0c8e21 100644 (file)
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<div align=right>
-Invoice: <!-- TMPL_VAR name="invoice" --><br>
-Received By: <!-- TMPL_VAR name="user" --><br>
-<!-- TMPL_VAR name="date" -->
-</div>
-<h1>Receipt Summary for: <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
-<CENTER>
-
+<div id="mainbloc">
+<h1 class="acquisition">Receipt Summary for: <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
+       <div id="bloc25">
+               Invoice: <!-- TMPL_VAR name="invoice" --><br>
+               Received By: <!-- TMPL_VAR name="user" --><br>
+               <!-- TMPL_VAR name="date" -->
+       </div>
 
-<!-- TMPL_IF name="count" -->
-       <script language="javascript" type="text/javascript">
-       <!--
-       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>");
-       }
-       //-->
-       </script>
-       <form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
-       <h1><!-- TMPL_VAR name="ordernumber" --> - Receive Order</h1><br>
-       Shopping Basket For: <!-- TMPL_VAR name="name" -->
-       <br> Order placed: <!-- TMPL_VAR name="date" -->
-       <P>
-       <CENTER>
-       <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-               <tr valign=top bgcolor="#99cc33" >
-                       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
-                               <B>CATALOGUE DETAILS</B>
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD><b>Title *</b></td>
-                       <td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->" >
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Author</td>
-                       <td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Copyright Date</td>
-                       <td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->" >
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Format</td>
-                       <td><!-- TMPL_VAR name="CGIitemtype" --></td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>ISBN</td>
-                       <td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Series</td>
-                       <td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Branch</td>
-                       <td><!-- TMPL_VAR name="CGIbranch" --></td>
-               </tr>
-               <TR VALIGN=TOP bgcolor="#ffffcc" >
-                       <TD><B>Item Barcode *</B></td>
-                       <td><input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->"></td>
-               </tr>
-               <TR VALIGN=TOP bgcolor="#ffffcc" >
-                       <TD><B>Volume Info (for serials) *</B></td>
-                       <td><input type=text size=20 name=volinf></td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <td colspan=2 align="center">
-                               <input type=hidden name=biblio value=<!-- TMPL_VAR name="biblionumber" -->>
-                               <input type=hidden name=ordnum value=<!-- TMPL_VAR name="ordernumber" -->>
-                               <input type=hidden name=biblioitemnum value=<!-- TMPL_VAR name="biblioitemnumber" -->>
-                               <input type=hidden name=id value="<!-- TMPL_VAR name="booksellerid" -->">
-                               <input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
-                               <input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
-                               <!-- TMPL_IF name="catview" -->
-                                       <input type="submit" class="button" value="save">
-                               <!-- TMPL_ELSE -->
-                                       <a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Edit</a>
-                               <!-- /TMPL_IF -->
-                       </td>
-               </tr>
-       </table>
-       <table border=1 cellspacing=0 cellpadding=5 width="40%">
-               <tr valign=top bgcolor="#99cc33">
-                       <td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD><B>Bookfund *</B></td>
-                       <td><!-- TMPL_VAR name="CGIbookfund" -->
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Quantity Ordered</td>
-                       <td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
-                       </td>
-               </tr>
-               <TR VALIGN=TOP bgcolor="#ffffcc">
-                       <TD><B>Quantity Received *</B></td>
-                       <td><input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Replacement Cost</td>
-                       <td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->">
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Budgeted Cost </td>
-                       <td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
-               </tr>
-               <TR VALIGN=TOP bgcolor="#ffffcc">
-                       <TD><B>Actual Cost *</B></td>
-                       <td><input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->"></td>
-               </tr>
-               <TR VALIGN=TOP bgcolor="#ffffcc">
-                       <TD>Invoice Number</td>
-                       <td>
-                               <!-- TMPL_VAR name="invoice" -->
-                               <input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
-                       </td>
-               </tr>
-               <TR VALIGN=TOP>
-                       <TD>Notes</td>
-                       <td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
-               </tr>
-       </table>
-       </form>
-       </center>
-       <br clear=all>
-       <p> &nbsp; </p>
-<!-- TMPL_ELSE -->
-       <br />
-       <center>
-       <table width="80%">
-       <tr valign=top bgcolor="#ffdf61">
-               <td><b>Basket</b></td>
-               <td><b>ISBN</b></td>
-               <td><b>TITLE</b></td>
-               <td><b>AUTHOR</b></td>
-               <td><b>Qty</b></td>
-               <td><b>Received</b></td>
-       </tr>
-       <!-- TMPL_LOOP name="loop" -->
+       <!-- TMPL_IF name="count" -->
+               <script language="javascript" type="text/javascript">
+               <!--
+               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>");
+               }
+               //-->
+               </script>
+               <form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
+               <h1 class="acquisition"><!-- TMPL_VAR name="ordernumber" --> - Receive Order</h1>
+               Shopping Basket For: <!-- TMPL_VAR name="name" -->
+               <br> Order placed: <!-- TMPL_VAR name="date" -->
+               <div id="bloc25">
+                               <h2 class="acquisition">catalogue details</h2>
+                       <p>
+                               <label>Title *</label>
+                               <input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->" >
+                       </p>
+                       <p>
+                               <label>Author</label>
+                               <input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
+                       </p>
+                       <p>
+                               <label>Copyright Date</label>
+                               <input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->" >
+                       </p>
+                       <p>
+                               <label>Format</label>
+                               <!-- TMPL_VAR name="CGIitemtype" -->
+                       </p>
+                       <p>
+                               <label>ISBN</label>
+                               <input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->">
+                       </p>
+                       <p>
+                               <label>Series</label>
+                               <input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->">
+                       </p>
+                       <p>
+                               <label>Branch</label>
+                               <!-- TMPL_VAR name="CGIbranch" -->
+                       </p>
+                       <p>
+                               <label>Item Barcode *</label>
+                               <input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
+                       </p>
+                       <p>
+                               <label>Volume Info (for serials) *</label>
+                               <input type=text size=20 name=volinf>
+                       </p>
+                       <p>
+                                       <input type=hidden name=biblio value=<!-- TMPL_VAR name="biblionumber" -->>
+                                       <input type=hidden name=ordnum value=<!-- TMPL_VAR name="ordernumber" -->>
+                                       <input type=hidden name=biblioitemnum value=<!-- TMPL_VAR name="biblioitemnumber" -->>
+                                       <input type=hidden name=id value="<!-- TMPL_VAR name="booksellerid" -->">
+                                       <input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
+                                       <input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
+                                       <!-- TMPL_IF name="catview" -->
+                                               <input type="submit" class="button acquisition" value="save">
+                                       <!-- TMPL_ELSE -->
+                                               <a class="button acquisition" href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->">
+                                                       Edit
+                                               </a>
+                                       <!-- /TMPL_IF -->
+                       </p>
+               </div>
+               <div id="bloc25">
+                       <h2 class="acquisition">Accounting details</h2>
+                       <p>
+                               <label>Bookfund *</label>
+                               <!-- TMPL_VAR name="CGIbookfund" -->
+                       </p>
+                       <p>
+                               <label>Quantity Ordered</label>
+                               <input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
+                       </p>
+                       <p>
+                               <label>Quantity Received *</label>
+                               <input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
+                       </p>
+                       <p>
+                               <label>Replacement Cost</label>
+                               <input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->">
+                       </p>
+                       <p>
+                               <label>Budgeted Cost </label>
+                               <input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->">
+                       </p>
+                       <p>
+                               <label>Actual Cost *</label>
+                               <input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->">
+                       </p>
+                       <p>
+                               <label>Invoice Number</label>
+                                       <!-- TMPL_VAR name="invoice" -->
+                                       <input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
+                       </p>
+                       <p>
+                               <label>Notes</label>
+                               <td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
+                       </p>
+               </div>
+               </form>
+       <!-- TMPL_ELSE -->
+               <table>
                <tr>
-                       <TD><!-- TMPL_VAR name="basketno" --></td>
-                       <TD><!-- TMPL_VAR name="isbn" --></td>
-                       <td><a href=acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" -->><!-- TMPL_VAR name="title" --></a></td>
-                       <td><!-- TMPL_VAR name="author" --></td>
-                       <td><!-- TMPL_VAR name="quantity" --></td>
-                       <td><!-- TMPL_VAR name="quantityrecieved" --></td>
-               </tr>
-       <!-- /TMPL_LOOP -->
-       </table>
-<!-- /TMPL_IF -->
+                       <th class="acquisition">Basket</th>
+                       <th class="acquisition">ISBN</th>
+                       <th class="acquisition">TITLE</th>
+                       <th class="acquisition">AUTHOR</th>
+                       <th class="acquisition">Qty</th>
+                       <th class="acquisition">Received</th>
+               </tr>
+               <!-- TMPL_LOOP name="loop" -->
+                       <tr>
+                               <td><!-- TMPL_VAR name="basketno" --></td>
+                               <td><!-- TMPL_VAR name="isbn" --></td>
+                               <td><a href=acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" -->><!-- TMPL_VAR name="title" --></a></td>
+                               <td><!-- TMPL_VAR name="author" --></td>
+                               <td><!-- TMPL_VAR name="quantity" --></td>
+                               <td><!-- TMPL_VAR name="quantityrecieved" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               </table>
+       <!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index 68a8ca0..8efd6b5 100644 (file)
@@ -1,63 +1,62 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<h1>Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
-Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> authorised by <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
-<CENTER>
-<p>
-<table border=0 cellspacing=0 cellpadding=5>
-       <tr valign=top bgcolor="#ffdf61">
-               <td width="5%"><b>Order</b></td>
-               <td width="10%"><b> Publisher</b></td>
-               <td width="10%"><b>Isbn</b></td>
-               <td width="30%"><b>Title</b></td>
-               <td width="20%"><b>Author</b></td>
-               <td width="5%"><b>$ rrp</b></td>
-               <td width="7%"><b>$est</b></td>
-               <td width="7%"><b>Qty</b></td>
-               <td width="7%"><b> Total</b></td>
-       </tr>
-       <!-- TMPL_LOOP name="books_loop" -->
-               <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
-                       <td><!-- TMPL_VAR name="ordernumber" --></td>
-                       <td><!-- TMPL_VAR name="publishercode" --></td>
-                       <td><!-- TMPL_VAR name="isbn" --></td>
-                       <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
-                       <td><!-- TMPL_VAR name="author" --></td>
-                       <td><!-- TMPL_VAR name="rrp" --></td>
-                       <td><!-- TMPL_VAR name="ecost" --></td>
-                       <td><!-- TMPL_VAR name="quantity" --></td>
-                       <td><!-- TMPL_VAR name="line_total" --></td>
+<div id="mainbloc">
+       <h1 class="acquisition">Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
+       Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> authorised by <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
+       <p>
+       <table>
+               <tr valign=top bgcolor="#ffdf61">
+                       <th class="acquisition" width="5%">Order</th>
+                       <th class="acquisition" width="10%">Publisher</th>
+                       <th class="acquisition" width="10%">Isbn</th>
+                       <th class="acquisition" width="30%">Title</th>
+                       <th class="acquisition" width="20%">Author</th>
+                       <th class="acquisition" width="5%">$ rrp</th>
+                       <th class="acquisition" width="7%">$est</th>
+                       <th class="acquisition" width="7%">Qty</th>
+                       <th class="acquisition" width="7%">Total</th>
                </tr>
-       <!-- /TMPL_LOOP -->
-       <input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
-       <input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
-       <tr valign=top bgcolor=white>
-               <td colspan=6 rowspan=3  bgcolor="#ffdf61">
-                       <b>HELP</b><br>
-                       To change any of the catalogue or accounting information attached to an order, click on the title.<br>
-               </td>
-               <td><b>SubTotal</b></td>
-               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td><b>GST</b></td>
-               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td><b>TOTAL</b></td>
-               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td colspan=9>
-                       <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-                               <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
-                               <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-                               <b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
-                       </form>
-               </td>
-       </tr>
-
-</table>
-</CENTER>
-
+               <!-- TMPL_LOOP name="books_loop" -->
+                       <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
+                               <td><!-- TMPL_VAR name="ordernumber" --></td>
+                               <td><!-- TMPL_VAR name="publishercode" --></td>
+                               <td><!-- TMPL_VAR name="isbn" --></td>
+                               <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
+                               <td><!-- TMPL_VAR name="author" --></td>
+                               <td><!-- TMPL_VAR name="rrp" --></td>
+                               <td><!-- TMPL_VAR name="ecost" --></td>
+                               <td><!-- TMPL_VAR name="quantity" --></td>
+                               <td><!-- TMPL_VAR name="line_total" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               <input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
+               <input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
+               <tr>
+                       <td colspan=6 rowspan=3>
+                               &nbsp;
+                       </td>
+                       <td><b>SubTotal</b></td>
+                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
+               </tr>
+               <tr>
+                       <td><b>GST</b></td>
+                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
+               </tr>
+               <tr>
+                       <td><b>TOTAL</b></td>
+                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
+               </tr>
+               <tr>
+                       <td colspan=9>
+                               <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
+                                       <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
+                                       <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
+                                       <b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
+                               </form>
+                       </td>
+               </tr>
+       
+       </table>
+       </CENTER>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index fddad9d..bd0a248 100755 (executable)
 <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<div id="mainbloc">
+       <h1 class="acquisition">Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+       <!-- TMPL_IF name ="testdonation" -->
+               <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+               <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 alt="Add New Biblio"></a>
+       <!-- TMPL_ELSE -->
+               <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
+               <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png"  border=0 alt="Add New Biblio"></a>
+       <!-- /TMPL_IF -->
+       <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
+               <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png"  border=0 alt="View Basket">
+       </a>
+       <form action="/cgi-bin/koha/acqui/newbasket2.pl">
+       <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+       <input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
+       <b>New Search: </b><input="text"  SIZE="25"   NAME="search">
+       <input type="submit" value="Search" class="button acquisition">
+       </form>
 
- <H1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></H1>
-
-<!-- TMPL_IF name ="testdonation" -->
-       <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
-       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
-<!-- TMPL_ELSE -->
-       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
-       <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
-<!-- /TMPL_IF -->
-
-<a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
-<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
-<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
-<input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
-<b>New Search: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
-<br clear=all>
-
-<CENTER>
-
-You searched on
-<B>
-<!-- TMPL_LOOP name="loopsearch" -->
-       <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
-<!-- /TMPL_LOOP -->
-</B>
-<BR>
-<!-- TMPL_VAR name="count" -->  results found.
-
-<br> Results <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR name="offset2" --></i> displayed.
-
-<TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
-       <TR  VALIGN=TOP bgcolor="#ffdf61">
-               <TD><b>TITLE</b></TD>
-               <TD><b>AUTHOR</b></TD>
-               <TD><b>&copy;</b></TD>
-               <TD><b>COUNT</b></TD>
-               <TD><b>LOCATION</b></TD>
-       </TR>
-
-<!-- TMPL_LOOP name="loopresult" -->
-       <TR VALIGN=TOP bgcolor="<!-- TMPL_VAR name="toggle" -->">
-               <TD>
-                       <!-- TMPL_IF name="testdonation" -->
-                               <A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
-                               </A>
-                       <!-- TMPL_ELSE -->
-                               <A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
-                               </A>
-                       <!-- /TMPL_IF -->
-               </TD>
-               <TD>
-                       <A HREF="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
-                       <!-- TMPL_VAR name="author" -->
-                       </A>
-               </TD>
-               <TD>
-                       <!-- TMPL_VAR name="copyright" -->
-               </TD>
-               <TD>
-                       <!-- TMPL_VAR name="itemcount" -->
-               </TD>
-               <TD>
-                       <!-- TMPL_IF name="use-location-flags-p" -->
-                       <!-- TMPL_IF name="location-only" --><!-- TMPL_VAR name="location-only" --><br><!-- /TMPL_IF -->
-                       <!-- TMPL_IF name="on-loan-p" -->On Loan<br><!-- /TMPL_IF -->
-                       <!-- TMPL_IF name="lost-p" -->Lost<br><!-- /TMPL_IF -->
-                       <!-- TMPL_IF name="mending-p" -->Mending<br><!-- /TMPL_IF -->
-                       <!-- TMPL_IF name="in-transit-p" -->In Transit<br><!-- /TMPL_IF -->
-                       <!-- TMPL_ELSE -->
-                       <!-- TMPL_VAR name="location" -->
-                       <!-- /TMPL_IF -->
-               </TD>
-       </TR>
-
-<!-- /TMPL_LOOP -->
-
-       <TR VALIGN=TOP bgcolor="#ffdf61">
-               <TD>
-                       &nbsp;
-               </TD>
-               <TD>
-                       &nbsp;
-               </TD>
-               <TD>
-                       &nbsp;
-               </TD>
-               <TD>
-                       &nbsp;
-               </TD>
-               <TD>
-                       &nbsp;
-               </TD>
-       </TR>
-</TABLE>
-
-<!-- TMPL_IF name="offsetover" -->
-<A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
-Next
-</A>
-<!-- /TMPL_IF -->
-</CENTER>
-
+       You searched on
+       <b>
+       <!-- TMPL_LOOP name="loopsearch" -->
+               <!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
+       <!-- /TMPL_LOOP -->
+       </b>
+       <br>
+       <!-- TMPL_VAR name="count" -->  results found.
+       
+       <br> Results <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR name="offset2" --></i> displayed.
+       
+       <table>
+               <tr>
+                       <th class="acquisition">TITLE</th>
+                       <th class="acquisition">AUTHOR</th>
+                       <th class="acquisition">&copy;</th>
+                       <th class="acquisition">COUNT</th>
+                       <th class="acquisition">LOCATION</th>
+               </tr>
+       
+       <!-- TMPL_LOOP name="loopresult" -->
+               <tr bgcolor="<!-- TMPL_VAR name="toggle" -->">
+                       <td>
+                               <!-- TMPL_IF name="testdonation" -->
+                                       <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
+                                       <!-- TMPL_VAR name="title" -->
+                                       </a>
+                               <!-- TMPL_ELSE -->
+                                       <a href="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
+                                       <!-- TMPL_VAR name="title" -->
+                                       </a>
+                               <!-- /TMPL_IF -->
+                       </td>
+                       <td>
+                               <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
+                               <!-- TMPL_VAR name="author" -->
+                               </a>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR name="copyright" -->
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR name="itemcount" -->
+                       </td>
+                       <td>
+                               <!-- TMPL_IF name="use-location-flags-p" -->
+                               <!-- TMPL_IF name="location-only" --><!-- TMPL_VAR name="location-only" --><br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="on-loan-p" -->On Loan<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="lost-p" -->Lost<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="mending-p" -->Mending<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="in-transit-p" -->In Transit<br><!-- /TMPL_IF -->
+                               <!-- TMPL_ELSE -->
+                               <!-- TMPL_VAR name="location" -->
+                               <!-- /TMPL_IF -->
+                       </td>
+               </tr>
+       
+       <!-- /TMPL_LOOP -->
+       
+               <tr bgcolor="#ffdf61">
+                       <td>
+                               &nbsp;
+                       </td>
+                       <td>
+                               &nbsp;
+                       </td>
+                       <td>
+                               &nbsp;
+                       </td>
+                       <td>
+                               &nbsp;
+                       </td>
+                       <td>
+                               &nbsp;
+                       </td>
+               </tr>
+       </table>
+       
+       <!-- TMPL_IF name="offsetover" -->
+       <a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
+       Next
+       </a>
+       <!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
index 49725ff..1fca859 100644 (file)
@@ -49,123 +49,109 @@ win.document.write("</font></body></html>");
 //-->
 
 </script>
-<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" --> -->
-<input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
-<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-<input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
-<input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
-<input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
-<input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
-<input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
-<input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
-<input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
-<input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
-<!-- TMPL_LOOP name="loop_currencies" -->
-       <input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
-<!-- /TMPL_LOOP -->
-<!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
-<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">View Basket</a>
-<h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
-Shopping Basket For: <!-- TMPL_VAR name="name" -->
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-       <tr valign=top bgcolor=#99cc33>
-               <td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD><b>Title *</b></td>
-               <td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->"></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Author</td>
-               <td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD> Publisher</td>
-               <td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
-       </tr>
-       <TR VALIGN=TOP>
-       <TD>Copyright Date</td>
-       <td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
-       </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Format</td>
-               <td><!-- TMPL_VAR name="CGIitemtype" --></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>ISBN</td>
-               <td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Series</td>
-               <td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Branch</td>
-               <td><!-- TMPL_VAR name="CGIbranch" --></td>
-       </tr>
-</table>
-<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-       <tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
-       <TR VALIGN=TOP>
-               <TD>Quantity</td>
-               <td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' ></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Bookfund</td>
-               <td><!-- TMPL_VAR name="CGIbookfund" --></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Suppliers List Price</td>
-               <td><input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Replacement Cost <br><FONT SIZE=2></td>
-               <td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Budgeted Cost<BR><FONT SIZE=2>(ex GST, inc discount)</FONT> </td>
-               <td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Budgeted GST</td>
-               <td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD><B>BUDGETED TOTAL</B></td>
-               <td><input type=text size=20 name=total value="" onchange='update(this.form)'></td>
-       </tr>
-       <TR VALIGN=TOP  bgcolor=#ffffcc>
-               <TD>Actual Cost</td>
-               <td><input type=text size=20 name=cost></td>
-       </tr>
-       <TR VALIGN=TOP  bgcolor=#ffffcc>
-               <TD>Invoice Number *</td>
-               <td><input type=text size=20 name=invoice ></td>
-       <TR VALIGN=TOP>
-               <TD>Notes</td>
-               <td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD colspan=2>
-               <input type="submit" value="OK" class="button">
-       </tr>
-</table>
-</form>
-</center>
-<table>
-<tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
-<UL>
-<LI>Bold fields must be filled in to create a new bibilo and item.<p>
-<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
-</UL>
-</td></tr></table>
-<p> &nbsp; </p>
+<div id="mainbloc">
+       <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" --> -->
+       <input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
+       <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
+       <input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
+       <input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
+       <input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
+       <input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
+       <input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
+       <input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
+       <input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
+       <input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
+       <!-- TMPL_LOOP name="loop_currencies" -->
+               <input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
+       <!-- /TMPL_LOOP -->
+       <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
+       <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button acquisition">View Basket</a>
+       <h1 class="acquisition"><!-- TMPL_VAR name="ordnum" --> - Order Details </h1>
+       Shopping Basket For <!-- TMPL_VAR name="name" -->
+       <div id="bloc25">
+               <h2 class="acquisition">catalogue details</h2>
+               <p>
+                       <label><b>Title *</b></label>
+                       <input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->">
+               </p>
+               <p>
+                       <label>Author</label>
+                       <input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
+               </p>
+               <p>
+                       <label> Publisher</label>
+                       <input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" >
+               </p>
+               <p>
+                       <label>Copyright Date</label>
+                       <input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
+               </p>
+               <p>
+                       <label>Format</label>
+                       <!-- TMPL_VAR name="CGIitemtype" -->
+               </p>
+               <p>
+                       <label>ISBN</label>
+                       <input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->">
+               </p>
+               <p>
+                       <label>Series</label>
+                       <input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->">
+               </p>
+               <p>
+                       <label>Branch</label>
+                       <!-- TMPL_VAR name="CGIbranch" -->
+               </p>
+       </div>
+       <div id="bloc25">
+               <h2 class="acquisition">Accounting details</h2>
+               <p>
+                       <label>Quantity</label>
+                       <input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' >
+               </p>
+               <p>
+                       <label>Bookfund</label>
+                       <!-- TMPL_VAR name="CGIbookfund" -->
+               </p>
+               <p>
+                       <label>Suppliers List Price</label>
+                       <input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'>
+               </p>
+               <p>
+                       <label>Replacement Cost </label>
+                       <input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
+               </p>
+               <p>
+                       <label>Budgeted Cost</label>
+                       <input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'>
+               </p>
+               <p>
+                       <label>Budgeted GST</label>
+                       <input type=text size=20 name=GST value="" onchange='update(this.form)'>
+               </p>
+               <p>
+                       <label><B>BUDGETED TOTAL</B></label>
+                       <input type=text size=20 name=total value="" onchange='update(this.form)'>
+               </p>
+               <p>
+                       <label>Actual Cost</label>
+                       <input type=text size=20 name=cost>
+               </p>
+               <p>
+                       <label>Invoice Number *</label>
+                       <input type=text size=20 name=invoice >
+               <p>
+                       <label>Notes</label>
+                       <input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->">
+               </p>
+               <p>
+                       <input type="submit" value="OK" class="button acquisition">
+               </p>
+       </form>
+       </div>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
 
 
index 9f25c6a..ae54538 100644 (file)
@@ -1,20 +1,20 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
-<h1>Supplier Search Results</h1>
+<h1 class="acquisition">Supplier Search Results</h1>
 <div id="bloc100">
-<div id="bloctitle">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</div>
+<h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
 <table>
 <tr>
-       <td><b>Order</b></td>
-       <td><b>Receive<b></td>
-       <td><b>Company</b></td>
-       <td>
-               <table>
+       <th class="acquisition">Order</th>
+       <th class="acquisition">Receive</th>
+       <th class="acquisition">Company</th>
+       <th class="acquisition">
+               <table class="noborder">
                        <tr>
-                               <td><b>Basket</b></td>
-                               <td><b>Items</b></td>
-                               <td><b>Staff</b></td>
-                               <td><b>Date</b></td>
+                               <th class="acquisition">Basket</th>
+                               <th class="acquisition">Items</th>
+                               <th class="acquisition">Staff</th>
+                               <th class="acquisition">Date</th>
                        </tr>
                </table>
        </td>
@@ -49,5 +49,5 @@
 </table>
 </CENTER>
 <br>
-<a class="button" href="supplier.pl?id=0">Add supplier</a>
+<a class="button acquisition" href="supplier.pl?id=0">Add supplier</a>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index 4bb01d9..25f5d78 100644 (file)
@@ -1,75 +1,75 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<div align=right>
-Invoice: <!-- TMPL_VAR name="invoice" --><br>
-Received By: <!-- TMPL_VAR name="user" --><br>
-<!-- TMPL_VAR name="date" -->
-</div>
-<h1>Receipt Summary for : <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
-<CENTER>
-
-<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
-<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
-<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
-<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
-<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
-
-<b>Search ISBN or Title:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form>
-<p>
-<FORM ACTION="" method=get name=orderform>
-
-<table border=0 cellspacing=0 cellpadding=5>
-       <tr valign=top bgcolor="#ffdf61">
-               <td><b>BASKET</b></td>
-               <td><b>ISBN</b></td>
-               <td><b>TITLE</b></td>
-               <td><b>AUTHOR</b></td>
-               <td><b>ACTUAL</b></td>
-               <td><b>P&P</b></td>
-               <td><b>QTY</b></td>
-               <td><b>TOTAL</b></td>
-       </tr>
-       <!-- TMPL_VAR name="count" -->
-       <!-- TMPL_LOOP name="loop_orders" -->
-               <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
-                       <td><!-- TMPL_VAR name="basketno" --></td>
-                       <td><!-- TMPL_VAR name="isbn" --></td>
-                       <td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" -->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
-                       <td><!-- TMPL_VAR name="author" --></td>
-                       <td>$<!-- TMPL_VAR name="unitprice" --></td>
-                       <td></td>
-                       <td><!-- TMPL_VAR name="quantityrecieved" --></td>
-                       <td>$<!-- TMPL_VAR name="total" --></td>
+<div id="mainbloc">
+       <h1 class="acquisition">Receipt Summary for : <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
+       
+       <div id="bloc25">
+               Invoice: <!-- TMPL_VAR name="invoice" --><br>
+               Received By: <!-- TMPL_VAR name="user" --><br>
+               <!-- TMPL_VAR name="date" -->
+       </div>
+       
+       <div id="bloc25">
+               <form action="/cgi-bin/koha/acqui/acquire.pl">
+                       <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
+                       <input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
+                       <input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
+                       <input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
+                       
+                       <b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve">
+               </form>
+       <p>
+       <form action="" method=get name=orderform>
+       
+       <table>
+               <tr>
+                       <th class="acquisition">BASKET</th>
+                       <th class="acquisition">ISBN</th>
+                       <th class="acquisition">TITLE</th>
+                       <th class="acquisition">AUTHOR</th>
+                       <th class="acquisition">ACTUAL</th>
+                       <th class="acquisition">P&P</th>
+                       <th class="acquisition">QTY</th>
+                       <th class="acquisition">TOTAL</th>
                </tr>
-       <!-- /TMPL_LOOP -->
-       <tr valign=top bgcolor=white>
-               <td colspan=8><hr>
-               </td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td></td>
-               <td></td>
-               <td></td>
-               <td><b>SUBTOTALS</b></td>
-               <td>$<!-- TMPL_VAR name="totalprice" --></td>
-               <td><!-- TMPL_VAR name="totalfreight" --></td>
-               <td><!-- TMPL_VAR name="totalquantity" --></td>
-               <td>$<!-- TMPL_VAR name="tototal" --></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td colspan=5 rowspan=2  bgcolor="#ffdf61">
-               <b>HELP</b>
-               <br>
-               The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
-               When you have finished this invoice save the changes.
-               </td>
-               <td colspan=2 align=right><b>GST</b></td>
-               <td>$<!-- TMPL_VAR name="gst" --></td>
-       </tr>
-       <tr valign=top bgcolor=white>
-               <td colspan=2 align=right ><b>TOTAL</b></td>
-               <td>$<!-- TMPL_VAR name="grandtot" --></td>
-       </tr>
-</table>
-</CENTER>
+               <!-- TMPL_VAR name="count" -->
+               <!-- TMPL_LOOP name="loop_orders" -->
+                       <tr bgcolor="<!-- TMPL_VAR name="color" -->">
+                               <td><!-- TMPL_VAR name="basketno" --></td>
+                               <td><!-- TMPL_VAR name="isbn" --></td>
+                               <td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" -->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
+                               <td><!-- TMPL_VAR name="author" --></td>
+                               <td>$<!-- TMPL_VAR name="unitprice" --></td>
+                               <td></td>
+                               <td><!-- TMPL_VAR name="quantityrecieved" --></td>
+                               <td>$<!-- TMPL_VAR name="total" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               <tr bgcolor=white>
+                       <th class="acquisition"></th>
+                       <th class="acquisition"></th>
+                       <th class="acquisition"></th>
+                       <th class="acquisition">SUBTOTALS</th>
+                       <th class="acquisition">$<!-- TMPL_VAR name="totalprice" --></th>
+                       <th class="acquisition"><!-- TMPL_VAR name="totalfreight" --></th>
+                       <th class="acquisition"><!-- TMPL_VAR name="totalquantity" --></th>
+                       <th class="acquisition">$<!-- TMPL_VAR name="tototal" --></th>
+               </tr>
+               <tr>
+                       <td colspan=5 rowspan=2  bgcolor="#ffdf61">
+                       <b>HELP</b>
+                       <br>
+                       The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
+                       When you have finished this invoice save the changes.
+                       </td>
+                       <td colspan=2 align=right><b>GST</b></td>
+                       <td>$<!-- TMPL_VAR name="gst" --></td>
+               </tr>
+               <tr bgcolor=white>
+                       <td colspan=2 align=right ><b>TOTAL</b></td>
+                       <td>$<!-- TMPL_VAR name="grandtot" --></td>
+               </tr>
+       </table>
+       </div>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index a82768a..49e5db3 100644 (file)
@@ -1,33 +1,27 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-
-<h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR name="name" --></a></h1>
-<p>
-<CENTER>
-<form method=get action="receive.pl">
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
-<p>
-<table border=1 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>SUPPLIER INVOICE INFORMATION</B></td></tr>
-<TR VALIGN=TOP >
-<TD>Supplier Invoice Number</td>
-<td><input type=text size=20 name=invoice>
-</td>
-</tr>
-<TR VALIGN=TOP bgcolor="#ffffcc">
-<TD>GST</td>
-<td><input type=text size=20 name=gst>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Freight</td>
-<td><input type=text size=20 name=freight>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<td colspan=2 align="center"><input type="submit" class="button" value="save">
-</td>
-</tr>
-</table>
-</CENTER>
-
+<div id="mainbloc">
+       <h1 class="acquisition">Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR name="name" --></a></h1>
+       <div id="bloc25">
+               <form method=get action="receive.pl">
+               <p>
+                       <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+                       <h2 class="acquisition">Supplier invoice information</h2>
+               <p>
+                       <label>Supplier Invoice Number</label>
+                       <input type=text size=20 name=invoice>
+               </p>
+               <p>
+                       <label>GST</label>
+                       <input type=text size=20 name=gst>
+               </p>
+               <p>
+                       <label>Freight</label>
+                       <input type=text size=20 name=freight>
+               </p>
+               <p>
+                       <input type="submit" class="button acquisition" value="save">
+               </p>
+               </form>
+       </div>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index 0b0f748..6b96958 100644 (file)
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<form action=updatesupplier.pl method=post>
-
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
-
-<!-- TMPL_IF NAME=id -->
-       <h1>Update: <!-- TMPL_VAR name="name" --></h1>
-<!-- TMPL_ELSE -->
-       <h1><em>Add supplier</h1>
-<!-- /TMPL_IF -->
-
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-       <tr valign=top bgcolor="#ffdf61">
-               <td colspan=2><B>COMPANY DETAILS</B></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD><b>Company Name</b></td>
-               <td><input type=text size=20 name=company value="<!-- TMPL_VAR name="name" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Postal Address</td>
-               <td>
-                       <textarea name="company_postal" cols=20 rows=3><!-- TMPL_VAR name="postal" --></textarea>
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Physical Address</td>
-               <td><textarea name=physical cols=20 rows=4><!-- TMPL_VAR name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Phone</td>
-               <td><input type=text size=20 name=company_phone value="<!-- TMPL_VAR name="phone" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Fax</td>
-               <td><input type=text size=20 name=company_fax value="<!-- TMPL_VAR name="fax" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Website</td>
-               <td><input type=text size=20 name=website value="<!-- TMPL_VAR name="url" -->">
-               </td>
-       </tr>
-       <tr valign=top bgcolor="#ffdf61">
-               <td colspan=2><B>CONTACT DETAILS</B></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Contact Name</td>
-               <td><input type=text size=20 name=company_contact_name value="<!-- TMPL_VAR name="contact" -->"></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Position</td>
-               <td><input type=text size=20 name=company_contact_position value="<!-- TMPL_VAR name="contpos" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Phone</td>
-               <td><input type=text size=20 name=contact_phone value="<!-- TMPL_VAR name="contphone" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Alternative Phone</td>
-               <td><input type=text size=20 name=contact_phone_2 value="<!-- TMPL_VAR name="contaltphone" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Fax</td>
-               <td><input type=text size=20 name=contact_fax value="<!-- TMPL_VAR name="contfax" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>E-mail</td>
-               <td><input type=text size=20 name=company_email value="<!-- TMPL_VAR name="contemail" -->">
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Notes</td>
-               <td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
-               </td>
-       </tr>
-</table>
-
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-       <tr valign=top bgcolor="#ffdf61">
-               <td colspan=2><B>CURRENT STATUS</B></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Supplier is</td>
-               <td>
-                        <!-- TMPL_IF name="active" -->
-                               <input type="radio" name="status" value="1" checked>Active
-                               <input type="radio" name="status" value="0">Inactive</td>
-                       <!-- TMPL_ELSE -->
-                               <input type="radio" name="status" value="1">Active
-                               <input type="radio" name="status" value="0" checked>Inactive</td>
-                       <!-- /TMPL_IF -->
-       </tr>
-       <tr valign=top bgcolor="#ffdf61">
-               <td colspan=2><B>ORDERING INFORMATION</B></td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Publishers and Imprints</td>
-               <td><textarea name="publishers_imprints" cols=20 rows=4><!-- TMPL_VAR name="specialty" --></textarea>
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>List Prices are</td>
-               <td>
-                       <select name=list_currency size=1>
-                       <!-- TMPL_LOOP name="loop_pricescurrency" -->
-                               <!-- TMPL_VAR name="currency" -->
-                       <!-- /TMPL_LOOP -->
-                       </select>
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Invoice Prices are</td>
-               <td>
-                       <select name=invoice_currency size=1>
-                       <!-- TMPL_LOOP name="loop_invoicecurrency" -->
-                               <!-- TMPL_VAR name="currency" -->
-                       <!-- /TMPL_LOOP -->
-                       </select>
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>GST Registered</td>
-               <td>
-                       <input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Yes
-                       <input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>List Item Price Includes GST</td>
-               <td>
-                       <input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Yes
-                       <input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>No
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Invoice Item Price Includes GST</td>
-               <td>
-                       <input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Yes
-                       <input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>No
-               </td>
-       </tr>
-       <TR VALIGN=TOP>
-               <TD>Discount</td>
-               <td><input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
-       </tr>
-</table>
-<br/>
-<br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save" class="button">
-</form>
-</center>
-
+<div id="mainbloc">
+       <form action=updatesupplier.pl method=post>
+       
+       <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+       
+       <!-- TMPL_IF NAME=id -->
+               <h1 class="acquisition">Update: <!-- TMPL_VAR name="name" --></h1>
+       <!-- TMPL_ELSE -->
+               <h1 class="acquisition">Add supplier</h1>
+       <!-- /TMPL_IF -->
+       <div id="bloc25">
+               <h2 class="acquisition">COMPANY DETAILS</h2>
+               <p>
+                       <label>Company Name</label>
+                       <input type=text size=20 name=company value="<!-- TMPL_VAR name="name" -->">
+               </p>
+               <p>
+                       <label>Postal Address</label>
+                               <textarea name="company_postal" cols=20 rows=3><!-- TMPL_VAR name="postal" --></textarea>
+               </p>
+               <p>
+                       <label>Physical Address</label>
+                       <textarea name=physical cols=20 rows=4><!-- TMPL_VAR name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
+               </p>
+               <p>
+                       <label>Phone</label>
+                       <input type=text size=20 name=company_phone value="<!-- TMPL_VAR name="phone" -->">
+               </p>
+               <p>
+                       <label>Fax</label>
+                       <input type=text size=20 name=company_fax value="<!-- TMPL_VAR name="fax" -->">
+               </p>
+               <p>
+                       <label>Website</label>
+                       <input type=text size=20 name=website value="<!-- TMPL_VAR name="url" -->">
+               </p>
+               <h2 class="acquisition">CONTACT DETAILS</h2>
+               <p>
+                       <label>Contact Name</label>
+                       <input type=text size=20 name=company_contact_name value="<!-- TMPL_VAR name="contact" -->">
+               </p>
+               <p>
+                       <label>Position</label>
+                       <input type=text size=20 name=company_contact_position value="<!-- TMPL_VAR name="contpos" -->">
+               </p>
+               <p>
+                       <label>Phone</label>
+                       <input type=text size=20 name=contact_phone value="<!-- TMPL_VAR name="contphone" -->">
+               </p>
+               <p>
+                       <label>Alternative phone</label>
+                       <input type=text size=20 name=contact_phone_2 value="<!-- TMPL_VAR name="contaltphone" -->">
+               </p>
+               <p>
+                       <label>Fax</label>
+                       <input type=text size=20 name=contact_fax value="<!-- TMPL_VAR name="contfax" -->">
+               </p>
+               <p>
+                       <label>E-mail</label>
+                       <input type=text size=20 name=company_email value="<!-- TMPL_VAR name="contemail" -->">
+               </p>
+               <p>
+                       <label>Notes</label>
+                       <textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
+               </p>
+       </div>
+       <div id="bloc25">
+               <h2 class="acquisition">CURRENT STATUS</h2>
+               <p>
+                       <label>Supplier is</label>
+                               <!-- TMPL_IF name="active" -->
+                                       <input type="radio" name="status" value="1" checked>Active
+                                       <input type="radio" name="status" value="0">Inactive</td>
+                               <!-- TMPL_ELSE -->
+                                       <input type="radio" name="status" value="1">Active
+                                       <input type="radio" name="status" value="0" checked>Inactive</td>
+                               <!-- /TMPL_IF -->
+               </p>
+               <h2 class="acquisition">ORDERING INFORMATION</h2>
+               </p>
+               <p>
+                       <label>Publishers and Imprints</label>
+                       <textarea name="publishers_imprints" cols=20 rows=4><!-- TMPL_VAR name="specialty" --></textarea>
+               </p>
+               <p>
+                       <label class="label100">List Prices are</label>
+                               <select name=list_currency size=1>
+                               <!-- TMPL_LOOP name="loop_pricescurrency" -->
+                                       <!-- TMPL_VAR name="currency" -->
+                               <!-- /TMPL_LOOP -->
+                               </select>
+               </p>
+               <p>
+                       <label class="label100">Invoice Prices are</label>
+                               <select name=invoice_currency size=1>
+                               <!-- TMPL_LOOP name="loop_invoicecurrency" -->
+                                       <!-- TMPL_VAR name="currency" -->
+                               <!-- /TMPL_LOOP -->
+                               </select>
+               </p>
+               <p>
+                       <label class="label100">GST Registered</label>
+                               <input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Yes
+                               <input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
+               </p>
+               <p>
+                       <label class="label100">List Item Price Includes GST</label>
+                               <input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Yes
+                               <input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>No
+               </p>
+               <p>
+                       <label class="label100">Invoice Item Price Includes GST</label>
+                               <input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Yes
+                               <input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>No
+               </p>
+               <p>
+                       <label class="label100">Discount</label>
+                       <input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
+               </p>
+       <br/>
+       <br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save" class="button acquisition">
+       </form>
+       </div>
+</div>
 
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->