Adding acquisitions menu to top, synching with default template, other minor markup changes

This commit is contained in:
oleonard 2006-01-05 22:39:42 +00:00
parent d7493fea8e
commit 9b60e07e4f
3 changed files with 47 additions and 57 deletions

View File

@ -1,5 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
@ -21,20 +22,6 @@
</div>
<!-- /TMPL_IF -->
<div class="details">
<form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
<caption>Receive or Modify a Periodical Order</caption>
<tr>
<th><label for="recieve">Title Search</label></th>
<td>
<input type="text" size="25" name="recieve" id="recieve" />
</td>
</tr>
</table>
<input type="submit" class="submit" value="Search" /></form>
</div>
<!-- currencies-->
<div class="details">
@ -47,7 +34,7 @@
<th>
<label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
</th>
<td> <form action="/cgi-bin/koha/currency.pl">
<td> <form action="/cgi-bin/koha/currency.pl" method="post">
<input type="hidden" name="type" value="change" />
<input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" /> </form>
</td>
@ -71,8 +58,7 @@
</div>
<!-- showbudget-->
<div class="table">
<!-- TMPL_IF name="nobudget" -->
<!-- TMPL_IF name="nobudget" -->
<div class="error">You must define a budget in parameters</div>
<!-- TMPL_ELSE -->
<table>
@ -102,11 +88,11 @@
<td><!-- TMPL_VAR name="totavail" --></td>
</tfoot>
</tr>
</table><!-- /TMPL_IF --></div>
</table><!-- /TMPL_IF -->
<p> Use your reload button [ctrl + r] to get the most recent figures.
Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
<div class="details">
<div class="help">
<h4>Help</h4> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item. </p>
<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>

View File

@ -1,29 +1,31 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
<h1>Order search</h3>
<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
<div class="data">
<table>
<thead><tr>
<th>&nbsp;</th>
<th>Supplier</th>
<th>Title/Author</th>
<th>Placed on</th>
<th>Recieved on</th>
<th>Quantity ordered</th>
<th>Quantity received</th>
<th>Unit cost</th>
<th>&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">Supplier</th>
<th scope="col">Title/Author</th>
<th scope="col">Placed on</th>
<th scope="col">Recieved on</th>
<th scope="col">Quantity ordered</th>
<th scope="col">Quantity received</th>
<th scope="col">Unit cost</th>
<th scope="col">&nbsp;</th>
</tr>
<tr>
<th>Filter By:</th>
<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /> <input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
<th> From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
<th scope="col">Filter By:</th>
<th scope="col"><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
<th scope="col"><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /> <input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
<th scope="col"> From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
<script language="JavaScript" type="text/javascript">
function validate1(date) {
@ -80,11 +82,11 @@
}
);
</script></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th><input type="submit" class="submit" value="Set Filter" /></th>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col">&nbsp;</th>
<th scope="col"><input type="submit" class="submit" value="Set Filter" /></th>
</tr></thead>
<tfoot><tr>
<td>&nbsp;</td>
@ -92,7 +94,6 @@
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td class="total"><!-- TMPL_VAR name="total_qty" --></td>
<td class="total"><!-- TMPL_VAR name="total_qtyreceived" --></td>
<td class="total"><!-- TMPL_VAR name="total_price" --></td>
@ -118,6 +119,6 @@
</tr>
<!-- /TMPL_LOOP -->
</tbody>
</table></form>
</table></div></form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

View File

@ -1,23 +1,25 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Late Orders<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-full-topmenu.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
<h1><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
<div class="data">
<table>
<tr>
<th>Supplier</th>
<th>Order Date</th>
<th>Ordered for</th>
<th>Including Basket</th>
<th>Book information</th>
<th>Branch</th>
<th>Estimated Unit Price</th>
<th>Retailer Catalogue Unit Price</th>
<th>Quantity</th>
<th>Total cost</th>
<th>Budget</th>
<th>&nbsp;</th>
<th scope="col">Supplier</th>
<th scope="col">Order Date</th>
<th scope="col">Ordered for</th>
<th scope="col">Including Basket</th>
<th scope="col">Book information</th>
<th scope="col">Branch</th>
<th scope="col">Estimated Unit Price</th>
<th scope="col">Retailer Catalogue Unit Price</th>
<th scope="col">Quantity</th>
<th scope="col">Total cost</th>
<th scope="col">Budget</th>
<th scope="col">&nbsp;</th>
</tr>
<tr>
<form action="lateorders.pl" method="post">
@ -26,7 +28,7 @@
</td>
<td> &nbsp;</td>
<td>
<input size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" > days
<input size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" /> days
</td>
<td colspan="2">
&nbsp;
@ -39,12 +41,12 @@
</td>
<td>
<input type="submit" value="filter" class="button acquisition">
<input type="submit" value="Filter" class="submit" />
</td>
</form>
</tr>
<!-- TMPL_LOOP name="lateorders" -->
<!--TMPL_IF Name="hilighted" --> <tr class="hilighted"> <!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
<!--TMPL_IF Name="hilighted" --> <tr class="highlight"> <!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
<td>
<!-- TMPL_VAR name="supplier" -->
</td>
@ -85,7 +87,7 @@
</td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
<tfoot><tr>
<th>
Total
</th>
@ -93,15 +95,16 @@
&nbsp;
</th>
<th> &nbsp;</th>
<th colspan="5">
<th colspan="7">
&nbsp;
</th>
<th>
<!-- TMPL_VAR name="total" -->
</th>
</tr>
</tr></tfoot>
</table>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->