[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui hists... [rel_2_2]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui hists... [rel_2_2] |
|
Date: |
Thu, 05 Jan 2006 22:44:23 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <address@hidden> 06/01/05 22:44:23
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui: histsearch.tmpl
lateorders.tmpl
Log message:
Adding acquisitions menu to top, synching with default template, other
minor markup changes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.6&tr2=1.1.2.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
Patches:
Index: koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl:1.1.2.6
koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl:1.1.2.7
--- koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl:1.1.2.6 Wed Jan
4 18:12:21 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl Thu Jan 5
22:44:23 2006
@@ -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> </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> </th>
+ <th scope="col"> </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"> </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> </th>
- <th> </th>
- <th> </th>
- <th> </th>
- <th><input type="submit" class="submit"
value="Set Filter" /></th>
+ <th scope="col"> </th>
+ <th scope="col"> </th>
+ <th scope="col"> </th>
+ <th scope="col"> </th>
+ <th scope="col"><input type="submit"
class="submit" value="Set Filter" /></th>
</tr></thead>
<tfoot><tr>
<td> </td>
@@ -92,7 +94,6 @@
<td> </td>
<td> </td>
<td> </td>
- <td> </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" -->
Index: koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl:1.1.2.1
koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl:1.1.2.2
--- koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl:1.1.2.1 Wed Jan
4 18:12:21 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl Thu Jan 5
22:44:23 2006
@@ -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> </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"> </th>
</tr>
<tr>
<form action="lateorders.pl" method="post">
@@ -26,7 +28,7 @@
</td>
<td> </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">
@@ -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 @@
</th>
<th> </th>
- <th colspan="5">
+ <th colspan="7">
</th>
<th>
<!-- TMPL_VAR name="total" -->
</th>
- </tr>
+ </tr></tfoot>
</table>
</div>
+</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->